diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:12:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:12:30 -0600 |
| commit | 11191ef0b9908604d1d7aaca382b011ef22c454c (patch) | |
| tree | d38f0ccd8bfcc9756f5cfc42fb2ad1dad351e6aa | |
| parent | c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (diff) | |
| download | koffice-11191ef0b9908604d1d7aaca382b011ef22c454c.tar.gz koffice-11191ef0b9908604d1d7aaca382b011ef22c454c.zip | |
Rename old tq methods that no longer need a unique name
899 files changed, 3078 insertions, 3078 deletions
diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc index 424e346df..c0219836a 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 043bf4e34..850998776 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 54e730a71..33b68a5b2 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 b7c8383ec..53f17ea8e 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 012f20275..7d5de556c 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 69c6edca3..8aa43e5a1 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 <UML:Operation visibility="public" xmi.id="476" type="virtual void" isAbstract="true" name="insert" > <UML:Parameter visibility="private" xmi.id="477" value="" type="KisTileSP" name="tile" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="tqsizeHint" > + <UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="sizeHint" > <UML:Parameter visibility="private" xmi.id="479" value="" type="Q_INT32" name="nelements" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="480" type="virtual " name="~KisTileCacheInterface" /> @@ -4485,7 +4485,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="473" label="KisTileCacheInterface" /> <listitem open="0" type="815" id="474" label="flush" /> <listitem open="0" type="815" id="476" label="insert" /> - <listitem open="0" type="815" id="478" label="tqsizeHint" /> + <listitem open="0" type="815" id="478" label="sizeHint" /> <listitem open="0" type="815" id="480" label="~KisTileCacheInterface" /> </listitem> <listitem open="0" type="813" id="1996" label="KisTileCommand" > diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui index 3e381bbe5..56f9e1c7b 100644 --- a/chalk/plugins/filters/blur/wdgblur.ui +++ b/chalk/plugins/filters/blur/wdgblur.ui @@ -32,7 +32,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -49,7 +49,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -76,13 +76,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui index 513912eae..4e1bdf431 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.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/chalk/plugins/filters/cimg/wdg_cimg.ui b/chalk/plugins/filters/cimg/wdg_cimg.ui index 397e52e6d..09d4e3236 100644 --- a/chalk/plugins/filters/cimg/wdg_cimg.ui +++ b/chalk/plugins/filters/cimg/wdg_cimg.ui @@ -42,7 +42,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui index ad1c062e4..c3c5afc66 100644 --- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui +++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui index 525b221ca..ba89fd8fc 100644 --- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui +++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index 1e576f662..2e8496581 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -50,13 +50,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>20</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>250</width> <height>20</height> @@ -84,13 +84,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>254</width> <height>254</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>254</width> <height>254</height> @@ -116,13 +116,13 @@ <property name="name"> <cstring>kCurve</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>250</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>250</width> <height>250</height> @@ -143,13 +143,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>250</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>250</height> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>20</height> diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui index 8d95814cc..c29550719 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -65,13 +65,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>20</height> @@ -134,13 +134,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>32767</height> 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 03c0e3369..9426d92cd 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>24</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index c14bd51a8..78259420e 100644 --- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui index 6ee2631a6..25705322c 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui +++ b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui index 841b78fb5..15dcff1ff 100644 --- a/chalk/plugins/filters/levelfilter/wdg_level.ui +++ b/chalk/plugins/filters/levelfilter/wdg_level.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -70,13 +70,13 @@ <property name="name"> <cstring>histview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>256</width> <height>256</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>256</width> <height>256</height> @@ -98,7 +98,7 @@ <property name="name"> <cstring>ingradient</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>256</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>20</height> @@ -162,7 +162,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>20</height> @@ -204,7 +204,7 @@ <property name="name"> <cstring>outgradient</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>256</width> <height>20</height> @@ -240,7 +240,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui index 3bafae01f..2741e1164 100644 --- a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui +++ b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc index 81ee1448f..72c0675b0 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 c9ce3acf5..934d465fd 100644 --- a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui +++ b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui index faf74dd4d..c2181eb88 100644 --- a/chalk/plugins/filters/unsharp/wdgunsharp.ui +++ b/chalk/plugins/filters/unsharp/wdgunsharp.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui index b81322623..e56f47604 100644 --- a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui +++ b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc index 1ec165619..208500184 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 89207a506..bca19dcee 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -183,7 +183,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc index c5f4e6eb0..2ab838136 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 7675b875d..0da52d4e7 100644 --- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui +++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui @@ -47,13 +47,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>32767</height> diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui index 8d3bf1d82..7f929231b 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui index 2cf6806e7..445231f7a 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc index 1d2c4d611..552e4c40f 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 67c6028b5..6dba5c01f 100644 --- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index 6f9af1c60..31163eb72 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 fedb1fd17..ddb47f471 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 69aae6249..2354cfbc0 100644 --- a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui +++ b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>190</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>31</height> diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index 60313cb22..bdda9901e 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 4b8127709..03972a16b 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui +++ b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui @@ -49,7 +49,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc index 90acf1309..0ceb3dd40 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 320b7d7af..0c5c5a9dd 100644 --- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui +++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -75,7 +75,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -124,7 +124,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>256</width> <height>150</height> diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc index 8a6567528..6ee07f306 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 6d24d60ac..d084060bc 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 1686fe97a..854dcd0af 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc index bb21f6f77..300161a8c 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 5e327aa8b..566dabc46 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 b69b998fa..5b4c8747e 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 dafb66698..e4a3386d2 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 03bd6b52c..9440a8fe4 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 884776f1f..450f8fda0 100644 --- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h index eb8fa60a1..5c0951a8e 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 346439022..65ae3c99f 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui +++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>lblImage</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>130</height> @@ -76,7 +76,7 @@ The image can be dragged to another application or document to copy the full scr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -167,7 +167,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>156</width> <height>16</height> @@ -225,7 +225,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index ec5ba7cc0..7d6e52f44 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 99078d0f2..3da5db516 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 f1eeeaa22..7e611f676 100644 --- a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui +++ b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc index a2c43aa91..afaedeebf 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 848eb3284..6facd42ac 100644 --- a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui +++ b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui @@ -56,7 +56,7 @@ <property name="name"> <cstring>shearAngleY</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>100</height> diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui index 65f20e23d..41553bd2c 100644 --- a/chalk/plugins/viewplugins/variations/wdg_variations.ui +++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui @@ -64,13 +64,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -95,13 +95,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -268,7 +268,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>187</height> @@ -287,7 +287,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>556</height> @@ -322,13 +322,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -364,13 +364,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -406,13 +406,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -460,13 +460,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>540</width> <height>556</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>540</width> <height>556</height> @@ -497,13 +497,13 @@ <height>150</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -574,13 +574,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -632,13 +632,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -671,13 +671,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -710,13 +710,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -787,13 +787,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -829,13 +829,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cc index cfe6905db..09955e9e3 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 0bc9ae087..2ef11147d 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 ed5be01d5..9b3666e89 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 9a719eeab..a5ad2d843 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 d52f5ec93..702ec2103 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 4d2103d81..b691295cd 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 2cf9ddefe..8c7fd2b5a 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 1cdd309c4..f5227eeef 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 13caff982..0594659bc 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 5c1367388..2d5e8a909 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 ca6a1b721..ac8e14a3a 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 a19edebeb..f898b497b 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 e8bf5ba86..dc5beadf1 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 f2d63cc39..0112ceb0c 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 cda77d689..10d20796d 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 1375caccb..108d60fec 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 424c405db..e9a1bf2dd 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 ca238b60e..2b866c2f7 100644 --- a/chalk/ui/kis_matrix_widget.ui +++ b/chalk/ui/kis_matrix_widget.ui @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> diff --git a/chalk/ui/kis_opengl_canvas_painter.cc b/chalk/ui/kis_opengl_canvas_painter.cc index 6ae123055..e6551f816 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 47983ce2f..24f2e2e26 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 a424d9acc..63766599a 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 2feb74c81..892686b3d 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 f1b522446..8e7bf40ae 100644 --- a/chalk/ui/kis_previewwidgetbase.ui +++ b/chalk/ui/kis_previewwidgetbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -56,13 +56,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>1000</width> <height>1000</height> diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cc index 4233bc11d..6de1aac33 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 0dca73228..cef260b40 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 44e86caed..327f09d7b 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 d6e600af5..039e41905 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 51eb1407b..bc478d4e4 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 e7696f0b3..045b43f9a 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 4455f17db..eecfa659e 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 542e257df..771e1ff87 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 96e1e032a..8393ccff9 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 6b957a26d..31a044f22 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 03a1cdb93..50f4bc778 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 00683ca95..632a03983 100644 --- a/chalk/ui/wdgautobrush.ui +++ b/chalk/ui/wdgautobrush.ui @@ -129,13 +129,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> @@ -242,13 +242,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> @@ -291,7 +291,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>95</width> <height>95</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui index 94a8a1372..3a2ca6291 100644 --- a/chalk/ui/wdgautogradient.ui +++ b/chalk/ui/wdgautogradient.ui @@ -45,7 +45,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> @@ -184,7 +184,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index 2b2b7910f..d0078c8ba 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -71,13 +71,13 @@ <property name="name"> <cstring>txtX</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -105,13 +105,13 @@ <property name="name"> <cstring>txtY</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -158,13 +158,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>75</width> <height>75</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>75</height> @@ -186,7 +186,7 @@ <property name="name"> <cstring>toolbar</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32</height> diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index 6f9e41e6b..b9912a79c 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -47,7 +47,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -295,7 +295,7 @@ The different rendering intent methods will affect only what is shown on screen, <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index dba17daca..bc6f898ab 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -138,7 +138,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>50</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui index 7936f20b8..4783a4a13 100644 --- a/chalk/ui/wdgcustompattern.ui +++ b/chalk/ui/wdgcustompattern.ui @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -84,7 +84,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>50</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui index 64b33f161..3a32af218 100644 --- a/chalk/ui/wdgdisplaysettings.ui +++ b/chalk/ui/wdgdisplaysettings.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>31</height> diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 53f3ef90c..217329221 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -40,7 +40,7 @@ <string>&Cursor tqshape:</string> </property> <property name="buddy" stdset="0"> - <cstring>m_cmbtqCursorShape</cstring> + <cstring>m_cmbCursorShape</cstring> </property> </widget> <widget class="TQComboBox"> @@ -65,7 +65,7 @@ </property> </item> <property name="name"> - <cstring>m_cmbtqCursorShape</cstring> + <cstring>m_cmbCursorShape</cstring> </property> </widget> </hbox> @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui index 18c1f528d..23ba8ba72 100644 --- a/chalk/ui/wdggridsettings.ui +++ b/chalk/ui/wdggridsettings.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>34</width> <height>20</height> @@ -294,13 +294,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> @@ -357,7 +357,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -427,7 +427,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui index d977802ef..d276a2cfd 100644 --- a/chalk/ui/wdglayerbox.ui +++ b/chalk/ui/wdglayerbox.ui @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>10</height> @@ -84,13 +84,13 @@ <property name="name"> <cstring>bnAdd</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> @@ -110,13 +110,13 @@ <property name="name"> <cstring>bnLower</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> @@ -136,13 +136,13 @@ <property name="name"> <cstring>bnRaise</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> @@ -162,13 +162,13 @@ <property name="name"> <cstring>bnProperties</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -202,13 +202,13 @@ <property name="name"> <cstring>bnDelete</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index dd3104831..197401609 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>61</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>480</width> <height>21</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>0</height> diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui index 3654031bf..3f8797d17 100644 --- a/chalk/ui/wdgpalettechooser.ui +++ b/chalk/ui/wdgpalettechooser.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>255</width> <height>20</height> diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui index c8e4404b4..1d3110d5e 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 <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -93,7 +93,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be <property name="name"> <cstring>m_swappiness</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>600</width> <height>32767</height> @@ -127,7 +127,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>139</height> diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui index 90f59a336..2a21e377a 100644 --- a/chalk/ui/wdgpressuresettings.ui +++ b/chalk/ui/wdgpressuresettings.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>89</height> diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui index 563c7dbce..2c485c4d7 100644 --- a/chalk/ui/wdgshapeoptions.ui +++ b/chalk/ui/wdgshapeoptions.ui @@ -35,7 +35,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui index f9dfaac61..091997bf2 100644 --- a/chalk/ui/wdgtabletdevicesettings.ui +++ b/chalk/ui/wdgtabletdevicesettings.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>90</height> diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui index 29ff9dbb9..34688d5d6 100644 --- a/chalk/ui/wdgtabletsettings.ui +++ b/chalk/ui/wdgtabletsettings.ui @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>90</height> diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index 5e5d5dac7..114c4baaa 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -47,7 +47,7 @@ <property name="name"> <cstring>lineEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/filters/chalk/gmagick/magickexport.cpp b/filters/chalk/gmagick/magickexport.cpp index e56f53d2a..2c49532ab 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 46a080f4f..b1b73bb55 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 dbfe6da8e..9400c5bd5 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 22bf3002a..6ade3a208 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 edfbbc021..c0eef02d5 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 ea55c12c7..918c44b57 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 2ca7c4c26..bacec6794 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 a32c367f7..9db52292d 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 cb405324d..40a6c32af 100644 --- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui +++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui @@ -136,7 +136,7 @@ Enabling progressive will cause the image to be displayed by the browser even wh <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>61</height> diff --git a/filters/chalk/magick/magickexport.cpp b/filters/chalk/magick/magickexport.cpp index 09f351c14..8c1e33657 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 46a080f4f..b1b73bb55 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 b5f73d198..d3e5bbb90 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 22bf3002a..6ade3a208 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 4859f5d94..062a072fb 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 7f0c71f95..ea62421cd 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 974d4a67e..8546edb2e 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 8bddb4f5d..8654df549 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 2cef93e92..be3af8ad4 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 06e22288d..ffb9c79e9 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 697a3e304..c91ecd998 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/filters/chalk/png/kis_png_export.cc b/filters/chalk/png/kis_png_export.cc index 8154866aa..ace659541 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 433b68e34..562628a97 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 ccfe43885..dc2a63256 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 3487d24d3..0412e7bd8 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 ec5e0ba8f..a635c2938 100644 --- a/filters/chalk/png/kis_wdg_options_png.ui +++ b/filters/chalk/png/kis_wdg_options_png.ui @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>5</height> diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index f006f913a..a5b863643 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 17fd576cb..e02caeede 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 26115762e..ffd7c59d0 100644 --- a/filters/chalk/raw/wdgrawimport.ui +++ b/filters/chalk/raw/wdgrawimport.ui @@ -36,7 +36,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>150</height> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>500</width> <height>20</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -408,7 +408,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp index 7a6ad9caf..597840090 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 bcd3f22eb..28495ff43 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 9efeb9406..bb78fd4f2 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 89d1763f0..8c785ffec 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 b9e33d061..77cfd0de5 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 d840dc8dc..b86d88abc 100644 --- a/filters/chalk/tiff/kis_wdg_options_tiff.ui +++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui @@ -711,7 +711,7 @@ You can uncheck the box if you are not using transparancy and you want to make t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/filters/chalk/xcf/xcfexport.cpp b/filters/chalk/xcf/xcfexport.cpp index b26fdba88..06bcf96fa 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 b8f260fbb..34595b069 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 6f07ebcf2..6b81ec679 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 434566bac..27f2cbfeb 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 f3ae2b13b..16b617a6b 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 7b47406b6..71448fce8 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 608bdf611..023943b9e 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 4a201ec52..4e8549957 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 c305b5365..3dd9a5601 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 b3df1581a..a17f94da3 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 3e42256ed..e0eff76c6 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 e1bd06a52..8696e6a39 100644 --- a/filters/karbon/eps/epsexport.cc +++ b/filters/karbon/eps/epsexport.cc @@ -87,7 +87,7 @@ EpsExport::EpsExport( KoFilter*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus EpsExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/x-eps" || from != "application/x-karbon" ) @@ -102,7 +102,7 @@ EpsExport::convert( const TQCString& from, const TQCString& to ) return KoFilter::StupidError; - KoFilter::ConversiontqStatus status = KoFilter::OK; + KoFilter::ConversionStatus status = KoFilter::OK; // Ask questions about PS level etc. EpsExportDlg* dialog = new EpsExportDlg(); @@ -194,7 +194,7 @@ EpsExport::visitVDocument( VDocument& document ) static_cast<KoDocumentInfoAuthor*>( docInfo.page( "author" ) ); // Get creation date/time = "now". - TQDateTime now( TQDateTime::tqcurrentDateTime() ); + TQDateTime now( TQDateTime::currentDateTime() ); *m_stream << "%%CreationDate: (" << now.toString( Qt::LocalDate ) << ")\n" diff --git a/filters/karbon/eps/epsexport.h b/filters/karbon/eps/epsexport.h index 1313294e8..f5867b430 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 0fefb3e0d..32a0845c4 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 873dc169a..c86be29d7 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 a260fd509..6e515b3fd 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 e140f088c..92e27a09f 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 903d50a2b..c3ee7b2a5 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 162176de1..9c721882f 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 90320d7e0..fba488671 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 2b395f48a..6e753d7de 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 4de61a44b..89b43d03f 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 3758daa36..df8939653 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 2e6610396..07381db8f 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 6bfe5d988..c79d1fded 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 5a5e90aa1..580512dc0 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 e4e3f56a7..636077a17 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 a04dfc11b..de929ca88 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 e0c9be57c..b13da88f2 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 23eaaa121..f7dcdcf3d 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 21bcee74b..34ee8140b 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 228024f3d..636268b76 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 b1a0f4fdc..124ea3fd1 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 3a7551813..cbe8ddbb6 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 b61313b98..001d1dc33 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 3e9237fb4..8de111972 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 82d868833..f6a7be702 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 5033762b4..faff17ff2 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 825b01567..d1a73abe6 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 8d8ad52c0..1507f5369 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 c04c0f22a..653aae9be 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 77488fa9d..a212e0afc 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 091ed125a..83672fae1 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 507c13a21..dc0c5689d 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 a49b837bb..2a442a22a 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 87ce21829..6e1eeebb2 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 a4a28e180..a2f54182f 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 c6d3611ef..d1c42111b 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 8dd3de342..eb71df946 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 25758e82f..328f1518e 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 65a5cef14..0296e574f 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 cd983fe66..2339dbf08 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 e1946f0f2..498204faa 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 41d73a4cf..34feba578 100644 --- a/filters/kivio/imageexport/kivio_imageexportwidget.ui +++ b/filters/kivio/imageexport/kivio_imageexportwidget.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc index d40cd6085..8dd96c5fa 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 f4141a097..30932652b 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 b87b8635e..c4ceb2438 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 23f45e28d..5cb896229 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 0e4771cf2..be986d920 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 ac3691928..dec5ec4c3 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 1dab566df..f7322342b 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 596ca703b..b187d189c 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 4f41aac7e..0b89e1871 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 ca3e7365d..6b75cfb30 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 990d12cd1..9eae5cd8e 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 eafdd792b..17e3d79ff 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 a75cccacc..2f15eeedf 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 78deb2ca6..584949d95 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 17e9cc65a..95f4727cb 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 9961d2182..c7a3b6c04 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 decdb81cf..ebc8a861f 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 cd93017b9..e9852c61f 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 df14a7564..c68ecffb1 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 8c3a72cfa..5e7090078 100644 --- a/filters/kspread/csv/dialogui.ui +++ b/filters/kspread/csv/dialogui.ui @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -223,7 +223,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -330,7 +330,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -472,7 +472,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -489,7 +489,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -506,7 +506,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>611</width> <height>20</height> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui index 45eb69144..a60c3d651 100644 --- a/filters/kspread/csv/exportdialogui.ui +++ b/filters/kspread/csv/exportdialogui.ui @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>96</height> @@ -375,7 +375,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -469,7 +469,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>81</height> diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc index bcbc98b8b..6121baaff 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 39a0ac0e9..293bda212 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 2e2c50e7d..0ecf41f7b 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 029cdac15..e4b6b499e 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 f1bade9e8..e705a9338 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 5b7337330..84729b4dd 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 8155bca54..651b7f2ce 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 29481fd00..b54f2a4c2 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 dcadc1c2e..1177b1bb7 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 cccfcc9fc..b56669162 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 392f0f723..0b2b03243 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 249258b3d..b0833e87e 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 b7fbd4bd1..c449a5997 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 df5dcc902..cfaedfa77 100644 --- a/filters/kspread/html/exportwidget.ui +++ b/filters/kspread/html/exportwidget.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -292,7 +292,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc index 54711d8d6..b81d8e22a 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 09f904d38..c7007157b 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 15e8ee2ab..ac7259820 100644 --- a/filters/kspread/kexi/kspread_kexiimport.cc +++ b/filters/kspread/kexi/kspread_kexiimport.cc @@ -74,7 +74,7 @@ KSpreadKexiImport::~KSpreadKexiImport() //============================================================================= -KoFilter::ConversiontqStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to ) { TQPtrList<TQListViewItem> objects; TQString file( m_chain->inputFile() ); diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h index aec658899..4de3e7045 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 d9d28d559..82f954069 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -196,7 +196,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>145</width> <height>0</height> diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc index 66927728e..c303a59ea 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 e7c0312be..1d8076eb9 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 8c3835edf..741a9c7ea 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc index ba56c2294..cc7b2b462 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 4ba82383e..13b3d380e 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 9ba2d8743..b1b9a0aa3 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 7e9abfede..eee950b92 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 9e37597cb..828d817ae 100644 --- a/filters/kspread/opencalc/opencalcexport.cc +++ b/filters/kspread/opencalc/opencalcexport.cc @@ -83,7 +83,7 @@ OpenCalcExport::OpenCalcExport( KoFilter *, const char *, const TQStringList & ) { } -KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from, +KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from, const TQCString & to ) { /* later... @@ -91,7 +91,7 @@ KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from, OpenCalcWorker * worker = new OpenCalcWorker(); leader->setWorker( worker ); - KoFilter::ConversiontqStatus status = leader->convert(); + KoFilter::ConversionStatus status = leader->convert(); delete worker; delete leader; @@ -227,7 +227,7 @@ bool OpenCalcExport::exportDocInfo( KoStore * store, const Doc* ksdoc ) data.appendChild( meta.createTextNode( aboutPage->subject() ) ); officeMeta.appendChild( data ); - const TQDateTime dt ( TQDateTime::tqcurrentDateTime() ); + const TQDateTime dt ( TQDateTime::currentDateTime() ); if ( dt.isValid() ) { data = meta.createElement( "dc:date" ); @@ -1073,7 +1073,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, TQDomElement t = doc.createElement( "text:date" ); t.setAttribute( "text:date-value", "0-00-00" ); // todo: "style:data-style-name", "N2" - t.appendChild( doc.createTextNode( TQDate::tqcurrentDate().toString() ) ); + t.appendChild( doc.createTextNode( TQDate::currentDate().toString() ) ); parent.appendChild( t ); } else if ( var == "<time>" ) diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h index 97832a9a5..03cfa245b 100644 --- a/filters/kspread/opencalc/opencalcexport.h +++ b/filters/kspread/opencalc/opencalcexport.h @@ -46,7 +46,7 @@ class OpenCalcExport : public KoFilter OpenCalcExport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OpenCalcExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString & from, + virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to ); private: diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 376a8f776..0fbe52e01 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -2735,7 +2735,7 @@ int OpenCalcImport::readMetaData() return result; } -KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to ) { kdDebug(30518) << "Entering OpenCalc Import filter: " << from << " - " << to << endl; @@ -2765,10 +2765,10 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ kdDebug(30518) << "Opening file " << endl; - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if ( pretqStatus != KoFilter::OK ) - return pretqStatus; + if ( preStatus != KoFilter::OK ) + return preStatus; emit sigProgress( 13 ); int tables = readMetaData(); @@ -2782,7 +2782,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ return KoFilter::OK; } -KoFilter::ConversiontqStatus OpenCalcImport::openFile() +KoFilter::ConversionStatus OpenCalcImport::openFile() { KoStore * store = KoStore::createStore( m_chain->inputFile(), KoStore::Read); @@ -2817,7 +2817,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::openFile() return KoFilter::OK; } -KoFilter::ConversiontqStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ) +KoFilter::ConversionStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ) { return OoUtils::loadAndParse( fileName, doc, m_store); } diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h index cd1f23b63..071a87ffe 100644 --- a/filters/kspread/opencalc/opencalcimport.h +++ b/filters/kspread/opencalc/opencalcimport.h @@ -47,7 +47,7 @@ class OpenCalcImport : public KoFilter OpenCalcImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OpenCalcImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: @@ -111,9 +111,9 @@ class OpenCalcImport : public KoFilter void loadOasisConditionValue( const TQString &styleCondition, KSpread::Conditional &newCondition ); void loadOasisCondition( TQString &valExpression, KSpread::Conditional &newCondition ); void loadOasisValidationValue( const TQStringList &listVal, KSpread::Conditional &newCondition ); - KoFilter::ConversiontqStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ); + KoFilter::ConversionStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ); - KoFilter::ConversiontqStatus openFile(); + KoFilter::ConversionStatus openFile(); }; #endif // OpenCalc_IMPORT_H__ diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc index 9a0db4fa1..920d20a70 100644 --- a/filters/kspread/qpro/qproimport.cc +++ b/filters/kspread/qpro/qproimport.cc @@ -94,7 +94,7 @@ QpImport::InitTableName(int pIdx, TQString& pResult) } } -KoFilter::ConversiontqStatus QpImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCString& to ) { bool bSuccess=true; diff --git a/filters/kspread/qpro/qproimport.h b/filters/kspread/qpro/qproimport.h index 1c3c7d851..e69d2a65e 100644 --- a/filters/kspread/qpro/qproimport.h +++ b/filters/kspread/qpro/qproimport.h @@ -37,7 +37,7 @@ public: QpImport(KoFilter* parent, const char* name, const TQStringList&); virtual ~QpImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); void InitTableName(int pIdx, TQString& pResult); }; diff --git a/filters/kugar/kugarnop/kugarnopimport.cpp b/filters/kugar/kugarnop/kugarnopimport.cpp index f8ad242c8..f3b132db8 100644 --- a/filters/kugar/kugarnop/kugarnopimport.cpp +++ b/filters/kugar/kugarnop/kugarnopimport.cpp @@ -31,7 +31,7 @@ KugarNOPImport::KugarNOPImport( KoFilter *, const char *, const TQStringList& ) { } -KoFilter::ConversiontqStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ ) +KoFilter::ConversionStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ ) { TQFile in( m_chain->inputFile()); diff --git a/filters/kugar/kugarnop/kugarnopimport.h b/filters/kugar/kugarnop/kugarnopimport.h index 030854107..a7099bc4a 100644 --- a/filters/kugar/kugarnop/kugarnopimport.h +++ b/filters/kugar/kugarnop/kugarnopimport.h @@ -28,7 +28,7 @@ class KugarNOPImport : public KoFilter public: KugarNOPImport( KoFilter *parent, const char *name, const TQStringList& ); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index 717611cda..cac51013b 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -1208,7 +1208,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo) *m_streamOut << "</m>\n"; - TQDateTime now (TQDateTime::tqcurrentDateTime(Qt::UTC)); // current time in UTC + TQDateTime now (TQDateTime::currentDateTime(Qt::UTC)); // current time in UTC *m_streamOut << "<m key=\"abiword.date_last_changed\">" << escapeAbiWordText(transformToTextDate(now)) << "</m>\n"; @@ -1225,7 +1225,7 @@ ABIWORDExport::ABIWORDExport(KoFilter */*parent*/, const char */*name*/, const T KoFilter() { } -KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/x-abiword" || from != "application/x-kword" ) { @@ -1252,7 +1252,7 @@ KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, cons return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/abiword/abiwordexport.h b/filters/kword/abiword/abiwordexport.h index 550b7682f..656283f85 100644 --- a/filters/kword/abiword/abiwordexport.h +++ b/filters/kword/abiword/abiwordexport.h @@ -47,6 +47,6 @@ public: ABIWORDExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~ABIWORDExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // ABIWORDEXPORT_H diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index 4815d02cf..2de6d4577 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -72,7 +72,7 @@ class StructureParser : public TQXmlDefaultHandler public: StructureParser(KoFilterChain* chain) : m_chain(chain), m_pictureNumber(0), m_pictureFrameNumber(0), m_tableGroupNumber(0), - m_timepoint(TQDateTime::tqcurrentDateTime(Qt::UTC)), m_fatalerror(false) + m_timepoint(TQDateTime::currentDateTime(Qt::UTC)), m_fatalerror(false) { createDocument(); structureStack.setAutoDelete(true); @@ -1757,7 +1757,7 @@ ABIWORDImport::ABIWORDImport(KoFilter */*parent*/, const char */*name*/, const T KoFilter() { } -KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to ) { if ((to != "application/x-kword") || (from != "application/x-abiword")) return KoFilter::NotImplemented; diff --git a/filters/kword/abiword/abiwordimport.h b/filters/kword/abiword/abiwordimport.h index 9ff4d764c..8b8349b71 100644 --- a/filters/kword/abiword/abiwordimport.h +++ b/filters/kword/abiword/abiwordimport.h @@ -50,6 +50,6 @@ public: ABIWORDImport(); virtual ~ABIWORDImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // ABIWORDIMPORT_H diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cc index dd4550b80..4084d3353 100644 --- a/filters/kword/amipro/amiproexport.cc +++ b/filters/kword/amipro/amiproexport.cc @@ -180,7 +180,7 @@ AmiProExport::AmiProExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus AmiProExport::convert( const TQCString& from, const TQCString& to ) { @@ -191,7 +191,7 @@ AmiProExport::convert( const TQCString& from, AmiProWorker* worker = new AmiProWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/amipro/amiproexport.h b/filters/kword/amipro/amiproexport.h index c9e1f5d96..bffb4362d 100644 --- a/filters/kword/amipro/amiproexport.h +++ b/filters/kword/amipro/amiproexport.h @@ -35,7 +35,7 @@ class AmiProExport : public KoFilter virtual ~AmiProExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __AMIPROEXPORT_H diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc index 7f37746cc..6061da206 100644 --- a/filters/kword/amipro/amiproimport.cc +++ b/filters/kword/amipro/amiproimport.cc @@ -157,9 +157,9 @@ static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout ) "\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\""; TQString linespacing; - linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) : - tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) : - tqlayout.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) : + linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) : + tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) : + tqlayout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) : TQString::number( tqlayout.linespace ); result.append( "<LAYOUT>\n" ); @@ -213,9 +213,9 @@ static TQString AmiProStyleAsXML( const AmiProStyle& style ) "left"; TQString linespacing; - linespacing = style.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) : - style.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) : - style.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) : + linespacing = style.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) : + style.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) : + style.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) : TQString::number( style.linespace ); TQString offsets; @@ -319,7 +319,7 @@ bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList format return true; } -KoFilter::ConversiontqStatus AmiProImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus AmiProImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "application/x-amipro" ) diff --git a/filters/kword/amipro/amiproimport.h b/filters/kword/amipro/amiproimport.h index ad0785437..45c8cc2ba 100644 --- a/filters/kword/amipro/amiproimport.h +++ b/filters/kword/amipro/amiproimport.h @@ -37,7 +37,7 @@ class AmiProImport : public KoFilter virtual ~AmiProImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __AMIPROIMPORT_H diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc index d7acc7ed8..8c8051116 100644 --- a/filters/kword/applixword/applixwordimport.cc +++ b/filters/kword/applixword/applixwordimport.cc @@ -85,7 +85,7 @@ APPLIXWORDImport::nextLine (TQTextStream & stream) * * * * ******************************************************************************/ -KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to ) { if (to!="application/x-kword" || from!="application/x-applixword") diff --git a/filters/kword/applixword/applixwordimport.h b/filters/kword/applixword/applixwordimport.h index ccd80df73..90333f474 100644 --- a/filters/kword/applixword/applixwordimport.h +++ b/filters/kword/applixword/applixwordimport.h @@ -50,7 +50,7 @@ public: APPLIXWORDImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXWORDImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: TQChar specCharfind (TQChar , TQChar ); diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui index 8f66942ce..8ba0d757b 100644 --- a/filters/kword/ascii/ExportDialogUI.ui +++ b/filters/kword/ascii/ExportDialogUI.ui @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui index fd124062c..d173386f0 100644 --- a/filters/kword/ascii/ImportDialogUI.ui +++ b/filters/kword/ascii/ImportDialogUI.ui @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc index 4f4fbb061..7bba005c1 100644 --- a/filters/kword/ascii/asciiexport.cc +++ b/filters/kword/ascii/asciiexport.cc @@ -474,7 +474,7 @@ ASCIIExport::ASCIIExport(KoFilter*, const char*, const TQStringList&) { } -KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus ASCIIExport::convert(const TQCString& from, const TQCString& to) { if (to != "text/plain" || from != "application/x-kword") { @@ -534,7 +534,7 @@ KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const T return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result = leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result = leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/ascii/asciiexport.h b/filters/kword/ascii/asciiexport.h index af1e2e04c..429ad6c89 100644 --- a/filters/kword/ascii/asciiexport.h +++ b/filters/kword/ascii/asciiexport.h @@ -31,7 +31,7 @@ public: ASCIIExport(KoFilter* parent, const char* name, const TQStringList&); virtual ~ASCIIExport() {} - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // ASCIIEXPORT_H diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc index f2a6e039b..7040e9f1e 100644 --- a/filters/kword/ascii/asciiimport.cc +++ b/filters/kword/ascii/asciiimport.cc @@ -195,7 +195,7 @@ void ASCIIImport::prepareDocument(TQDomDocument& mainDocument, TQDomElement& mai } -KoFilter::ConversiontqStatus ASCIIImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ASCIIImport::convert( const TQCString& from, const TQCString& to ) { if (to!="application/x-kword" || from!="text/plain") return KoFilter::NotImplemented; diff --git a/filters/kword/ascii/asciiimport.h b/filters/kword/ascii/asciiimport.h index 4d332776b..b2cfcbdd4 100644 --- a/filters/kword/ascii/asciiimport.h +++ b/filters/kword/ascii/asciiimport.h @@ -65,7 +65,7 @@ public: ASCIIImport(); virtual ~ASCIIImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: // not yet changed #if 0 void WriteOutTableCell( int table_no, int row, int col, Position *pos, diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cc index db9c754ac..372a3b5c4 100644 --- a/filters/kword/docbook/docbookexport.cc +++ b/filters/kword/docbook/docbookexport.cc @@ -782,7 +782,7 @@ bool DocBookWorker::doFullDocumentInfo ( const KWEFDocumentInfo &docInfo ) } -KoFilter::ConversiontqStatus DocBookExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus DocBookExport::convert( const TQCString& from, const TQCString& to ) { #if 0 kdError (30507) << "to = " << to << ", from = " << from << endl; diff --git a/filters/kword/docbook/docbookexport.h b/filters/kword/docbook/docbookexport.h index cf7ec8041..29362aaa4 100644 --- a/filters/kword/docbook/docbookexport.h +++ b/filters/kword/docbook/docbookexport.h @@ -38,6 +38,6 @@ public: DocBookExport (KoFilter *parent, const char *name, const TQStringList & ); virtual ~DocBookExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // DOCBOOKEXPORT_H diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp index 6fc353e5b..bfab48ab2 100644 --- a/filters/kword/hancomword/hancomwordimport.cpp +++ b/filters/kword/hancomword/hancomwordimport.cpp @@ -82,7 +82,7 @@ static inline unsigned long readU16( const void* p ) } -KoFilter::ConversiontqStatus HancomWordImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HancomWordImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/x-hancomword" ) return KoFilter::NotImplemented; diff --git a/filters/kword/hancomword/hancomwordimport.h b/filters/kword/hancomword/hancomwordimport.h index 64d279a88..f78c3a47c 100644 --- a/filters/kword/hancomword/hancomwordimport.h +++ b/filters/kword/hancomword/hancomwordimport.h @@ -35,7 +35,7 @@ public: HancomWordImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~HancomWordImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: class Private; diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui index cbdc4fc20..e68cb6abd 100644 --- a/filters/kword/html/export/ExportDialogUI.ui +++ b/filters/kword/html/export/ExportDialogUI.ui @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> diff --git a/filters/kword/html/export/htmlexport.cc b/filters/kword/html/export/htmlexport.cc index f8af8e3ee..285735176 100644 --- a/filters/kword/html/export/htmlexport.cc +++ b/filters/kword/html/export/htmlexport.cc @@ -61,7 +61,7 @@ HTMLExport::HTMLExport(KoFilter *, const char *, const TQStringList &) : KoFilter() { } -KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) { if ((from != "application/x-kword") || (to != "text/html")) { @@ -118,7 +118,7 @@ KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const T delete worker; return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/html/export/htmlexport.h b/filters/kword/html/export/htmlexport.h index 5de5ef6a9..10617bae5 100644 --- a/filters/kword/html/export/htmlexport.h +++ b/filters/kword/html/export/htmlexport.h @@ -39,7 +39,7 @@ public: HTMLExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // HTMLEXPORT_H diff --git a/filters/kword/html/import/htmlimport.cpp b/filters/kword/html/import/htmlimport.cpp index 2c403b2f8..9b29320d1 100644 --- a/filters/kword/html/import/htmlimport.cpp +++ b/filters/kword/html/import/htmlimport.cpp @@ -39,7 +39,7 @@ HTMLImport::HTMLImport(KoFilter *, const char*, const TQStringList &) : // 123 } -KoFilter::ConversiontqStatus HTMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLImport::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" || from!="text/html") return KoFilter::NotImplemented; diff --git a/filters/kword/html/import/htmlimport.h b/filters/kword/html/import/htmlimport.h index f7c61a413..ab2a293c7 100644 --- a/filters/kword/html/import/htmlimport.h +++ b/filters/kword/html/import/htmlimport.h @@ -37,7 +37,7 @@ public: HTMLImport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // HTMLIMPORT_H diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp index ebcf3f6a7..82812412a 100644 --- a/filters/kword/kword1.3/import/kword13import.cpp +++ b/filters/kword/kword1.3/import/kword13import.cpp @@ -104,7 +104,7 @@ bool KWord13Import::postParse( KoStore* store, KWord13Document& doc ) return post.postParse( store, doc ); } -KoFilter::ConversiontqStatus KWord13Import::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KWord13Import::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/vnd.oasis.opendocument.text" || from != "application/x-kword" ) diff --git a/filters/kword/kword1.3/import/kword13import.h b/filters/kword/kword1.3/import/kword13import.h index 7d60dd892..77c05c23d 100644 --- a/filters/kword/kword1.3/import/kword13import.h +++ b/filters/kword/kword1.3/import/kword13import.h @@ -39,7 +39,7 @@ public: KWord13Import(KoFilter *parent, const char *name, const TQStringList &); virtual ~KWord13Import() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: bool parseInfo( TQIODevice* io, KWord13Document& kwordDocument ); bool parseRoot( TQIODevice* io, KWord13Document& kwordDocument ); diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cc index f521ec9de..083f23755 100644 --- a/filters/kword/latex/export/latexexport.cc +++ b/filters/kword/latex/export/latexexport.cc @@ -36,7 +36,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) { TQString config; diff --git a/filters/kword/latex/export/latexexport.h b/filters/kword/latex/export/latexexport.h index e7c0312be..1d8076eb9 100644 --- a/filters/kword/latex/export/latexexport.h +++ b/filters/kword/latex/export/latexexport.h @@ -38,7 +38,7 @@ class LATEXExport : public KoFilter LATEXExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __LATEXExport_H__ */ diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 8c3835edf..741a9c7ea 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cc index f644910a1..00f069cf2 100644 --- a/filters/kword/latex/import/lateximport.cc +++ b/filters/kword/latex/import/lateximport.cc @@ -35,7 +35,7 @@ LATEXImport::LATEXImport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus LATEXImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXImport::convert( const TQCString& from, const TQCString& to ) { TQString config; diff --git a/filters/kword/latex/import/lateximport.h b/filters/kword/latex/import/lateximport.h index 949d7163b..9c85cad03 100644 --- a/filters/kword/latex/import/lateximport.h +++ b/filters/kword/latex/import/lateximport.h @@ -38,7 +38,7 @@ class LATEXImport : public KoFilter LATEXImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __LATEXIMPORT_H__ */ diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc index 3e9a724e3..b627ebd29 100644 --- a/filters/kword/libexport/KWEFKWordLeader.cc +++ b/filters/kword/libexport/KWEFKWordLeader.cc @@ -1361,7 +1361,7 @@ bool KWEFKWordLeader::loadSubFile(const TQString& fileName, TQByteArray& array) return true; } -KoFilter::ConversiontqStatus KWEFKWordLeader::convert( KoFilterChain* chain, +KoFilter::ConversionStatus KWEFKWordLeader::convert( KoFilterChain* chain, const TQCString& from, const TQCString& to) { if ( from != "application/x-kword" ) diff --git a/filters/kword/libexport/KWEFKWordLeader.h b/filters/kword/libexport/KWEFKWordLeader.h index 78ce13488..ee1d7694e 100644 --- a/filters/kword/libexport/KWEFKWordLeader.h +++ b/filters/kword/libexport/KWEFKWordLeader.h @@ -38,7 +38,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader public: void setWorker ( KWEFBaseWorker *newWorker ); KWEFBaseWorker *getWorker(void) const; - KoFilter::ConversiontqStatus convert( KoFilterChain* chain, + KoFilter::ConversionStatus convert( KoFilterChain* chain, const TQCString& from, const TQCString& to); public: // ### TODO: where to put in the end? void createBookmarkFormatData( ParaData& paraData ); diff --git a/filters/kword/msword/mswordimport.cpp b/filters/kword/msword/mswordimport.cpp index 3be95f7a2..714db2742 100644 --- a/filters/kword/msword/mswordimport.cpp +++ b/filters/kword/msword/mswordimport.cpp @@ -41,7 +41,7 @@ MSWordImport::~MSWordImport() { } -KoFilter::ConversiontqStatus MSWordImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MSWordImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if ( to != "application/x-kword" || from != "application/msword" ) diff --git a/filters/kword/msword/mswordimport.h b/filters/kword/msword/mswordimport.h index 73a568ffd..ae348fc72 100644 --- a/filters/kword/msword/mswordimport.h +++ b/filters/kword/msword/mswordimport.h @@ -33,7 +33,7 @@ public: MSWordImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~MSWordImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem ); diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index 07eb3da72..10c3abb92 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -464,7 +464,7 @@ void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::W int dist = fontSize > 20 ? 2 : 1; if (chp->fImprint) // ## no real support for imprint, we use a topleft shadow dist = -dist; - css = TQString::tqfromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist); + css = TQString::fromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist); } shadowElem.setAttribute( "text-shadow", css ); format.appendChild( shadowElem ); diff --git a/filters/kword/mswrite/ImportDialogUI.ui b/filters/kword/mswrite/ImportDialogUI.ui index db7dcc208..bed2bad1a 100644 --- a/filters/kword/mswrite/ImportDialogUI.ui +++ b/filters/kword/mswrite/ImportDialogUI.ui @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -218,7 +218,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -237,7 +237,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc index 02d980ef2..e6d211b9b 100644 --- a/filters/kword/mswrite/mswriteexport.cc +++ b/filters/kword/mswrite/mswriteexport.cc @@ -1450,13 +1450,13 @@ public: { if (tqlayout.tqalignment == "left") // quite useless since MSWrite::Alignment::Left is the default anyway - paraProp.tqsetAlignment (MSWrite::Alignment::Left); + paraProp.setAlignment (MSWrite::Alignment::Left); else if (tqlayout.tqalignment == "right") - paraProp.tqsetAlignment (MSWrite::Alignment::Right); + paraProp.setAlignment (MSWrite::Alignment::Right); else if (tqlayout.tqalignment == "center") - paraProp.tqsetAlignment (MSWrite::Alignment::Center); + paraProp.setAlignment (MSWrite::Alignment::Center); else if (tqlayout.tqalignment == "justify") - paraProp.tqsetAlignment (MSWrite::Alignment::Justify); + paraProp.setAlignment (MSWrite::Alignment::Justify); else kdWarning (30509) << "Unknown Alignment: " << tqlayout.tqalignment << endl; } @@ -1903,7 +1903,7 @@ MSWriteExport::~MSWriteExport () { } -KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, const TQCString &to) +KoFilter::ConversionStatus MSWriteExport::convert (const TQCString &from, const TQCString &to) { kdDebug (30509) << "MSWriteExport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite " << MSWrite::Version << endl; @@ -1929,7 +1929,7 @@ KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, cons return KoFilter::OutOfMemory; } - KoFilter::ConversiontqStatus ret = leader->convert (m_chain, from, to); + KoFilter::ConversionStatus ret = leader->convert (m_chain, from, to); int errorCode = worker->getError (); delete leader; diff --git a/filters/kword/mswrite/mswriteexport.h b/filters/kword/mswrite/mswriteexport.h index 796ce705f..adfbc4ba9 100644 --- a/filters/kword/mswrite/mswriteexport.h +++ b/filters/kword/mswrite/mswriteexport.h @@ -31,7 +31,7 @@ public: MSWriteExport (KoFilter *parent, const char *name, const TQStringList &); virtual ~MSWriteExport (); - KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to); + KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to); }; #endif // MSWRITEEXPORT_H diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc index 379d3c015..c28c9d62a 100644 --- a/filters/kword/mswrite/mswriteimport.cc +++ b/filters/kword/mswrite/mswriteimport.cc @@ -1345,7 +1345,7 @@ MSWriteImport::~MSWriteImport () delete m_device; } -KoFilter::ConversiontqStatus MSWriteImport::convert (const TQCString &from, const TQCString &to) +KoFilter::ConversionStatus MSWriteImport::convert (const TQCString &from, const TQCString &to) { kdDebug (30509) << "MSWriteImport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite " << MSWrite::Version << endl; diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h index 65be7e7aa..8d59fe38e 100644 --- a/filters/kword/mswrite/mswriteimport.h +++ b/filters/kword/mswrite/mswriteimport.h @@ -40,7 +40,7 @@ public: MSWriteImport (KoFilter *parent, const char *name, const TQStringList &); virtual ~MSWriteImport (); - KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to); + KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to); void sigProgress (const int value) { diff --git a/filters/kword/mswrite/structures.h b/filters/kword/mswrite/structures.h index af687b3a3..5aa4f6a39 100644 --- a/filters/kword/mswrite/structures.h +++ b/filters/kword/mswrite/structures.h @@ -378,7 +378,7 @@ namespace MSWrite // convenience functions Byte getAlign (void) const { return getAlignment (); } - void setAlign (const Byte val) { tqsetAlignment (val); } + void setAlign (const Byte val) { setAlignment (val); } Short getLeftIndentFirstLine (const bool purist = false) const { diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h index 0ee985ce1..bc0687588 100644 --- a/filters/kword/mswrite/structures_generated.h +++ b/filters/kword/mswrite/structures_generated.h @@ -759,7 +759,7 @@ namespace MSWrite // Byte getAlignment (void) const { return m_tqalignment; } - void tqsetAlignment (const Byte val) { m_tqalignment = val; signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/); } + void setAlignment (const Byte val) { m_tqalignment = val; signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/); } Word getRightIndent (void) const { return m_rightIndent; } void setRightIndent (const Word val) { m_rightIndent = val; signalHaveSetData (m_rightIndent == Word (0), 32/*offset*/ + 16/*size*/); } diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc index ff9c82765..9287169fc 100644 --- a/filters/kword/oowriter/ExportFilter.cc +++ b/filters/kword/oowriter/ExportFilter.cc @@ -2160,12 +2160,12 @@ void OOWriterWorker::declareFont(const TQString& fontName) { TQString props; - // Disabled, as TQFontInfo::tqstyleHint() cannot guess + // Disabled, as TQFontInfo::styleHint() cannot guess #if 0 TQFont font(fontName); TQFontInfo info(font); props+="style:font-family-generic=\"" - switch (info.tqstyleHint()) + switch (info.styleHint()) { case TQFont::SansSerif: default: @@ -2217,7 +2217,7 @@ TQString OOWriterWorker::makeAutomaticStyleName(const TQString& prefix, ulong& c return str2; // If it is still not unique, try a time stamp. - const TQDateTime dt(TQDateTime::tqcurrentDateTime(Qt::UTC)); + const TQDateTime dt(TQDateTime::currentDateTime(Qt::UTC)); str2 = str + "_" + TQString::number(dt.toTime_t(),16); if (m_styleMap.find(str2)==m_styleMap.end()) diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc index 209b2bec6..2401508c8 100644 --- a/filters/kword/oowriter/conversion.cc +++ b/filters/kword/oowriter/conversion.cc @@ -37,13 +37,13 @@ TQPair<int,TQString> Conversion::importWrapping( const TQString& oowrap ) if ( oowrap == "run-through" ) return tqMakePair( 0, TQString() ); if ( oowrap == "biggest" ) // OASIS extension - return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) ); + return tqMakePair( 1, TQString::fromLatin1( "biggest" ) ); ////if ( oowrap == "parallel" || oowrap == "dynamic" ) // dynamic is called "optimal" in the OO GUI. It's different from biggest because it can lead to parallel. // Those are not supported in KWord, let's use biggest instead - return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) ); + return tqMakePair( 1, TQString::fromLatin1( "biggest" ) ); } TQString Conversion::exportWrapping( const TQPair<int,TQString>& runAroundAttribs ) diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cc index 426105e81..aba0ee9fd 100644 --- a/filters/kword/oowriter/oowriterexport.cc +++ b/filters/kword/oowriter/oowriterexport.cc @@ -52,7 +52,7 @@ OOWRITERExport::OOWRITERExport(KoFilter */*parent*/, const char */*name*/, const KoFilter() { } -KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/vnd.sun.xml.writer" || from != "application/x-kword" ) { @@ -79,7 +79,7 @@ KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, con return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/oowriter/oowriterexport.h b/filters/kword/oowriter/oowriterexport.h index 8f4695b82..bd1a0f403 100644 --- a/filters/kword/oowriter/oowriterexport.h +++ b/filters/kword/oowriter/oowriterexport.h @@ -47,6 +47,6 @@ public: OOWRITERExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~OOWRITERExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // OOWRITEREXPORT_H diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc index 5fd196f8a..87e41f492 100644 --- a/filters/kword/oowriter/oowriterimport.cc +++ b/filters/kword/oowriter/oowriterimport.cc @@ -69,7 +69,7 @@ OoWriterImport::~OoWriterImport() { } -KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OoWriterImport::convert( TQCString const & from, TQCString const & to ) { kdDebug(30518) << "Entering Oowriter Import filter: " << from << " - " << to << endl; @@ -99,20 +99,20 @@ KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQ } - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); TQImage thumbnail; - if ( pretqStatus == KoFilter::OK ) + if ( preStatus == KoFilter::OK ) { // We do not care about the failure OoUtils::loadThumbnail( thumbnail, m_zip ); } - if ( pretqStatus != KoFilter::OK ) + if ( preStatus != KoFilter::OK ) { m_zip->close(); delete m_zip; - return pretqStatus; + return preStatus; } m_currentMasterPage = TQString(); @@ -535,14 +535,14 @@ TQDomElement OoWriterImport::createInitialFrame( TQDomElement& parentFramesetEle return frameElementOut; } -KoFilter::ConversiontqStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc) +KoFilter::ConversionStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc) { return OoUtils::loadAndParse( filename, doc, m_zip); } -KoFilter::ConversiontqStatus OoWriterImport::openFile() +KoFilter::ConversionStatus OoWriterImport::openFile() { - KoFilter::ConversiontqStatus status=loadAndParse("content.xml", m_content); + KoFilter::ConversionStatus status=loadAndParse("content.xml", m_content); if ( status != KoFilter::OK ) { kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl; @@ -1817,7 +1817,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href.mid(1)); - KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); picture.setKey(key); if (!m_zip) @@ -1966,7 +1966,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } const TQDate date(dt.date()); @@ -1995,7 +1995,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } diff --git a/filters/kword/oowriter/oowriterimport.h b/filters/kword/oowriter/oowriterimport.h index 80586a312..4de60534c 100644 --- a/filters/kword/oowriter/oowriterimport.h +++ b/filters/kword/oowriter/oowriterimport.h @@ -38,7 +38,7 @@ public: OoWriterImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoWriterImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem ); @@ -61,8 +61,8 @@ private: void createDocumentInfo( TQDomDocument &docinfo ); void createDocumentContent( TQDomDocument &doccontent, TQDomElement& mainFramesetElement ); void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement ); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc); - KoFilter::ConversiontqStatus openFile(); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc); + KoFilter::ConversionStatus openFile(); bool createStyleMap( const TQDomDocument & styles, TQDomDocument& doc ); void insertStyles( const TQDomElement& element, TQDomDocument& doc ); void importDateTimeStyle( const TQDomElement& parent ); diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp index 65a835185..89af187cf 100644 --- a/filters/kword/palmdoc/palmdb.cpp +++ b/filters/kword/palmdoc/palmdb.cpp @@ -38,9 +38,9 @@ PalmDB::PalmDB() setName( "Unnamed" ); setAttributes( 0 ); setVersion( 0 ); - setCreationDate( TQDateTime::tqcurrentDateTime() ); - setModificationDate( TQDateTime::tqcurrentDateTime() ); - setLastBackupDate( TQDateTime::tqcurrentDateTime() ); + setCreationDate( TQDateTime::currentDateTime() ); + setModificationDate( TQDateTime::currentDateTime() ); + setLastBackupDate( TQDateTime::currentDateTime() ); setType( TQString() ); setCreator( TQString() ); @@ -73,11 +73,11 @@ bool PalmDB::load( const char* filename ) // read and encode database name // The name field is 32 bytes long, and is NUL terminated. - // Use the length parameter of tqfromLatin1() anyway. + // Use the length parameter of fromLatin1() anyway. TQ_UINT8 name[32]; for(int k = 0; k < 32; k++) stream >> name[k]; - m_name = TQString::tqfromLatin1( (char*) name, 31 ); + m_name = TQString::fromLatin1( (char*) name, 31 ); // read database attribute TQ_UINT16 attr; @@ -121,12 +121,12 @@ bool PalmDB::load( const char* filename ) // read and encode database type TQ_UINT8 dbt[4]; stream >> dbt[0] >> dbt[1] >> dbt[2] >> dbt[3]; - m_type = TQString::tqfromLatin1( (char*) dbt, 4 ); + m_type = TQString::fromLatin1( (char*) dbt, 4 ); // read and encode database creator TQ_UINT8 dbc[4]; stream >> dbc[0] >> dbc[1] >> dbc[2] >> dbc[3]; - m_creator = TQString::tqfromLatin1( (char*) dbc, 4 ); + m_creator = TQString::fromLatin1( (char*) dbc, 4 ); // read unique id seed TQ_UINT32 idseed; diff --git a/filters/kword/palmdoc/palmdoc.cpp b/filters/kword/palmdoc/palmdoc.cpp index 791fa3566..72bb0434c 100644 --- a/filters/kword/palmdoc/palmdoc.cpp +++ b/filters/kword/palmdoc/palmdoc.cpp @@ -106,7 +106,7 @@ bool PalmDoc::load( const char* filename ) // if the text is not compressed, simply append as string if( format == 1 ) - setText( TQString::tqfromLatin1( rec.data(),rec.count() ) ); + setText( TQString::fromLatin1( rec.data(),rec.count() ) ); // done m_result = OK; @@ -120,7 +120,7 @@ bool PalmDoc::save( const char* filename ) setCreator( "REAd" ); // "touch" the database :-) - setModificationDate( TQDateTime::tqcurrentDateTime() ); + setModificationDate( TQDateTime::currentDateTime() ); // Palm record size is always 4 KB unsigned recsize = 4096; diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cc index 5e18ff6f5..9b748fa79 100644 --- a/filters/kword/palmdoc/palmdocexport.cc +++ b/filters/kword/palmdoc/palmdocexport.cc @@ -115,7 +115,7 @@ PalmDocExport::PalmDocExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from, +KoFilter::ConversionStatus PalmDocExport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion @@ -125,7 +125,7 @@ KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from, PalmDocWorker* worker = new PalmDocWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/palmdoc/palmdocexport.h b/filters/kword/palmdoc/palmdocexport.h index fd2a11406..4c09946b7 100644 --- a/filters/kword/palmdoc/palmdocexport.h +++ b/filters/kword/palmdoc/palmdocexport.h @@ -35,7 +35,7 @@ class PalmDocExport : public KoFilter virtual ~PalmDocExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __PALMDOCEXPORT_H diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc index 98cd76296..540560854 100644 --- a/filters/kword/palmdoc/palmdocimport.cc +++ b/filters/kword/palmdoc/palmdocimport.cc @@ -46,7 +46,7 @@ PalmDocImport::PalmDocImport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus PalmDocImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "application/vnd.palm" ) diff --git a/filters/kword/palmdoc/palmdocimport.h b/filters/kword/palmdoc/palmdocimport.h index a97f97298..77b4cc73f 100644 --- a/filters/kword/palmdoc/palmdocimport.h +++ b/filters/kword/palmdoc/palmdocimport.h @@ -37,7 +37,7 @@ class PalmDocImport : public KoFilter virtual ~PalmDocImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: diff --git a/filters/kword/pdf/pdfdocument.cpp b/filters/kword/pdf/pdfdocument.cpp index ffe27e1c2..80ec92d08 100644 --- a/filters/kword/pdf/pdfdocument.cpp +++ b/filters/kword/pdf/pdfdocument.cpp @@ -38,7 +38,7 @@ Document::Document() : _file(0), _object(0), _fileStream(0), _document(0), _device(0) {} -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus Document::init(const TQString &name, const TQString &ownerPassword, const TQString &userPassword) { diff --git a/filters/kword/pdf/pdfdocument.h b/filters/kword/pdf/pdfdocument.h index c54606f45..b2da781fb 100644 --- a/filters/kword/pdf/pdfdocument.h +++ b/filters/kword/pdf/pdfdocument.h @@ -43,7 +43,7 @@ class Document Document(); ~Document() { clear(); } - KoFilter::ConversiontqStatus init(const TQString &name, + KoFilter::ConversionStatus init(const TQString &name, const TQString &ownerPassword, const TQString &userPassword); void clear(); diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp index bee3e39a0..e2aa72e87 100644 --- a/filters/kword/pdf/pdfimport.cpp +++ b/filters/kword/pdf/pdfimport.cpp @@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY(libpdfimport, PdfImportFactory()) PdfImport::PdfImport(KoFilter *, const char *, const TQStringList&) {} -KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from, +KoFilter::ConversionStatus PdfImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion @@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from, return KoFilter::NotImplemented; // read file - KoFilter::ConversiontqStatus result + KoFilter::ConversionStatus result = _doc.init(m_chain->inputFile(), TQString(), TQString()); if ( result!=KoFilter::OK ) return result; diff --git a/filters/kword/pdf/pdfimport.h b/filters/kword/pdf/pdfimport.h index 9686714ea..53ca8f976 100644 --- a/filters/kword/pdf/pdfimport.h +++ b/filters/kword/pdf/pdfimport.h @@ -33,7 +33,7 @@ class PdfImport : public KoFilter public: PdfImport(KoFilter *parent, const char *name, const TQStringList&); - KoFilter::ConversiontqStatus + KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); private: diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc index 2fa566fac..6fefe85e8 100644 --- a/filters/kword/rtf/export/ExportFilter.cc +++ b/filters/kword/rtf/export/ExportFilter.cc @@ -967,10 +967,10 @@ void RTFWorker::writeFontData(void) } #else else - // TQFontInfo:tqstyleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out. + // TQFontInfo:styleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out. { TQFontInfo info(*it); - switch (info.tqstyleHint()) + switch (info.styleHint()) { case TQFont::SansSerif: default: diff --git a/filters/kword/rtf/export/rtfexport.cc b/filters/kword/rtf/export/rtfexport.cc index 15ff976be..6f23530b1 100644 --- a/filters/kword/rtf/export/rtfexport.cc +++ b/filters/kword/rtf/export/rtfexport.cc @@ -57,7 +57,7 @@ RTFExport::RTFExport(KoFilter *, const char *, const TQStringList &) : KoFilter() { } -KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus RTFExport::convert( const TQCString& from, const TQCString& to ) { if ((from != "application/x-kword") || (to != "text/rtf" && to != "application/msword" )) { @@ -77,7 +77,7 @@ KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQ return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain, from,to ); + KoFilter::ConversionStatus result=leader->convert(m_chain, from,to ); delete leader; delete worker; diff --git a/filters/kword/rtf/export/rtfexport.h b/filters/kword/rtf/export/rtfexport.h index 060139ed6..5218e4c5e 100644 --- a/filters/kword/rtf/export/rtfexport.h +++ b/filters/kword/rtf/export/rtfexport.h @@ -39,7 +39,7 @@ public: RTFExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~RTFExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // RTFEXPORT_H diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp index 94fad6970..5bfadbcbb 100644 --- a/filters/kword/rtf/import/rtfimport.cpp +++ b/filters/kword/rtf/import/rtfimport.cpp @@ -309,7 +309,7 @@ RTFImport::RTFImport( KoFilter *, const char *, const TQStringList& ) fnnum=0; } -KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCString& to ) { // This filter only supports RTF to KWord conversion if ((from != "text/rtf") || (to != "application/x-kword")) @@ -911,7 +911,7 @@ void RTFImport::setEnumProperty( RTFProperty *property ) void RTFImport::setFontStyleHint( RTFProperty* property ) { - font.tqstyleHint = TQFont::StyleHint( property->value ); + font.styleHint = TQFont::StyleHint( property->value ); } void RTFImport::setPictureType( RTFProperty* property ) @@ -1321,7 +1321,7 @@ void RTFImport::parseFontTable( RTFProperty * ) if (token.type == RTFTokenizer::OpenGroup) { font.name = TQString(); - font.tqstyleHint = TQFont::AnyStyle; + font.styleHint = TQFont::AnyStyle; font.fixedPitch = 0; } else if (token.type == RTFTokenizer::PlainText) @@ -1344,7 +1344,7 @@ void RTFImport::parseFontTable( RTFProperty * ) // Use TQt to look up the closest matching installed font TQFont qFont( font.name ); qFont.setFixedPitch( (font.fixedPitch == 1) ); - qFont.setStyleHint( font.tqstyleHint ); + qFont.setStyleHint( font.styleHint ); for(;!qFont.exactMatch();) { int space=font.name.findRev(' ', font.name.length()); @@ -1362,7 +1362,7 @@ void RTFImport::parseFontTable( RTFProperty * ) else fontTable.insert( state.format.font, newFontName ); font.name.truncate( 0 ); - font.tqstyleHint = TQFont::AnyStyle; + font.styleHint = TQFont::AnyStyle; font.fixedPitch = 0; } } @@ -1538,8 +1538,8 @@ void RTFImport::parsePicture( RTFProperty * ) // Add anchor to rich text destination addAnchor( frameName ); - // It is safe, as we call tqcurrentDateTime only once for each picture - const TQDateTime dt(TQDateTime::tqcurrentDateTime()); + // It is safe, as we call currentDateTime only once for each picture + const TQDateTime dt(TQDateTime::currentDateTime()); // Add pixmap or clipart (key) pictures.addKey( dt, idStr, pictName ); @@ -1614,7 +1614,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName ) // Add anchor to rich text destination addAnchor( frameName ); - // It is safe, as we call tqcurrentDateTime only once for each picture + // It is safe, as we call currentDateTime only once for each picture const TQDateTime dt( pic.getKey().lastModified() ); // Add picture key diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h index bf4f20b74..2003b508d 100644 --- a/filters/kword/rtf/import/rtfimport.h +++ b/filters/kword/rtf/import/rtfimport.h @@ -93,7 +93,7 @@ struct RTFTab struct RTFFont { TQString name; - TQFont::StyleHint tqstyleHint; + TQFont::StyleHint styleHint; int fixedPitch; int number; }; @@ -255,7 +255,7 @@ public: * @param to the mimetype for KWord * @return true if the document was successfully converted */ - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); /** * Skip the keyword, as we do not need to do anything with it diff --git a/filters/kword/starwriter/starwriterimport.cc b/filters/kword/starwriter/starwriterimport.cc index a9bd80d36..104e08f9a 100644 --- a/filters/kword/starwriter/starwriterimport.cc +++ b/filters/kword/starwriter/starwriterimport.cc @@ -58,7 +58,7 @@ StarWriterImport::~StarWriterImport() { } -KoFilter::ConversiontqStatus StarWriterImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus StarWriterImport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion // When 4.x is supported, use also: || (from != "application/x-starwriter") diff --git a/filters/kword/starwriter/starwriterimport.h b/filters/kword/starwriter/starwriterimport.h index b030c2ba1..f71a71eda 100644 --- a/filters/kword/starwriter/starwriterimport.h +++ b/filters/kword/starwriter/starwriterimport.h @@ -34,7 +34,7 @@ class StarWriterImport: public KoFilter public: StarWriterImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~StarWriterImport(); - KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); private: // most important OLE streams diff --git a/filters/kword/starwriter/status.html b/filters/kword/starwriter/status.html index 6919c5899..d7667e6c8 100644 --- a/filters/kword/starwriter/status.html +++ b/filters/kword/starwriter/status.html @@ -7,7 +7,7 @@ <META NAME="GENERATOR" CONTENT="Quanta Plus"> </HEAD> <BODY> - <H2 align="center">tqStatus of the</H2> + <H2 align="center">Status of the</H2> <H1 align="center">StarWriter 5.x filter for KWord</H1> <P>Author: <A HREF="mailto:info@marcozanon.com">Marco Zanon</A> diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc index 92908c57d..10837ba13 100644 --- a/filters/kword/wml/wmlexport.cc +++ b/filters/kword/wml/wmlexport.cc @@ -145,7 +145,7 @@ WMLExport::WMLExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from, +KoFilter::ConversionStatus WMLExport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion @@ -155,7 +155,7 @@ KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from, WMLWorker* worker = new WMLWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/wml/wmlexport.h b/filters/kword/wml/wmlexport.h index 8d3a105eb..2f81c8974 100644 --- a/filters/kword/wml/wmlexport.h +++ b/filters/kword/wml/wmlexport.h @@ -35,7 +35,7 @@ class WMLExport : public KoFilter virtual ~WMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WMLEXPORT_H diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc index e44c10ae9..a92290d9a 100644 --- a/filters/kword/wml/wmlimport.cc +++ b/filters/kword/wml/wmlimport.cc @@ -231,7 +231,7 @@ void WMLConverter::parse( const char* filename ) } -KoFilter::ConversiontqStatus WMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WMLImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "text/vnd.wap.wml" ) diff --git a/filters/kword/wml/wmlimport.h b/filters/kword/wml/wmlimport.h index 049ff8dbd..1c169af19 100644 --- a/filters/kword/wml/wmlimport.h +++ b/filters/kword/wml/wmlimport.h @@ -37,7 +37,7 @@ class WMLImport : public KoFilter virtual ~WMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WMLIMPORT_H diff --git a/filters/kword/wordperfect/export/wpexport.cc b/filters/kword/wordperfect/export/wpexport.cc index 43a688c34..619d5d476 100644 --- a/filters/kword/wordperfect/export/wpexport.cc +++ b/filters/kword/wordperfect/export/wpexport.cc @@ -47,7 +47,7 @@ WPExport::WPExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus WPExport::convert( const TQCString& from, const TQCString& to ) { @@ -69,7 +69,7 @@ WPExport::convert( const TQCString& from, KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/wordperfect/export/wpexport.h b/filters/kword/wordperfect/export/wpexport.h index 55f43a478..16e81a1ba 100644 --- a/filters/kword/wordperfect/export/wpexport.h +++ b/filters/kword/wordperfect/export/wpexport.h @@ -35,7 +35,7 @@ class WPExport : public KoFilter virtual ~WPExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WPEXPORT_H diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc index 460915af0..09fc4d5c2 100644 --- a/filters/kword/wordperfect/import/wpimport.cc +++ b/filters/kword/wordperfect/import/wpimport.cc @@ -227,7 +227,7 @@ WPImport::WPImport( KoFilter *, const char *, const TQStringList& ): KoFilter() { } -KoFilter::ConversiontqStatus WPImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if(to!= "application/vnd.sun.xml.writer" || from != "application/wordperfect" ) diff --git a/filters/kword/wordperfect/import/wpimport.h b/filters/kword/wordperfect/import/wpimport.h index 02cd323d2..3fc527961 100644 --- a/filters/kword/wordperfect/import/wpimport.h +++ b/filters/kword/wordperfect/import/wpimport.h @@ -48,7 +48,7 @@ class WPImport : public KoFilter virtual ~WPImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WPIMPORT_H diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc index 9a4ac58bb..cac0783f4 100644 --- a/filters/liboofilter/ooutils.cc +++ b/filters/liboofilter/ooutils.cc @@ -499,7 +499,7 @@ void OoUtils::createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo) } } -KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store ) +KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store ) { kdDebug(30518) << "loadAndParse: Trying to open " << fileName << endl; @@ -508,13 +508,13 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& fileName, TQD kdWarning(30519) << "Entry " << fileName << " not found!" << endl; return KoFilter::FileNotFound; } - KoFilter::ConversiontqStatus converttqStatus = loadAndParse( m_store->device(),doc, fileName ); + KoFilter::ConversionStatus convertStatus = loadAndParse( m_store->device(),doc, fileName ); m_store->close(); - return converttqStatus; + return convertStatus; } -KoFilter::ConversiontqStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName) +KoFilter::ConversionStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName) { TQXmlInputSource source( io ); // Copied from TQDomDocumentPrivate::setContent, to change the whitespace thing @@ -538,7 +538,7 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument } -KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip) +KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip) { kdDebug(30519) << "Trying to open " << filename << endl; @@ -562,12 +562,12 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& filename, TQD const KZipFileEntry* f = static_cast<const KZipFileEntry *>(entry); kdDebug(30519) << "Entry " << filename << " has size " << f->size() << endl; TQIODevice* io = f->device(); - KoFilter::ConversiontqStatus converttqStatus = loadAndParse( io,doc, filename ); + KoFilter::ConversionStatus convertStatus = loadAndParse( io,doc, filename ); delete io; - return converttqStatus; + return convertStatus; } -KoFilter::ConversiontqStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip ) +KoFilter::ConversionStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip ) { const TQString filename( "Thumbnails/thumbnail.png" ); kdDebug(30519) << "Trying to open thumbnail " << filename << endl; diff --git a/filters/liboofilter/ooutils.h b/filters/liboofilter/ooutils.h index 70de64c8e..a668d961d 100644 --- a/filters/liboofilter/ooutils.h +++ b/filters/liboofilter/ooutils.h @@ -80,14 +80,14 @@ namespace OoUtils void importTextPosition( const TQString& text_position, TQString& value, TQString& relativetextsize ); void createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store ); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store ); /// Load an OASIS thumbnail - KoFilter::ConversiontqStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip ); + KoFilter::ConversionStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip ); // Internal - KoFilter::ConversiontqStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName); + KoFilter::ConversionStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName); } #endif /* OOUTILS_H */ diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc index ef4f6cd06..fafefdbd0 100644 --- a/filters/olefilters/olefilter.cc +++ b/filters/olefilters/olefilter.cc @@ -69,7 +69,7 @@ OLEFilter::~OLEFilter() delete docfile; } -KoFilter::ConversiontqStatus OLEFilter::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus OLEFilter::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" && to!="application/x-kspread" && @@ -153,7 +153,7 @@ void OLEFilter::slotSavePart( if ( srcMime == KMimeType::defaultMimeType() ) kdWarning( s_area ) << "Couldn't determine the mimetype from the extension" << endl; - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; TQCString destMime( mimeType.latin1() ); storageId = TQString::number( embedPart( srcMime.latin1(), destMime, status, nameIN ) ); diff --git a/filters/olefilters/olefilter.h b/filters/olefilters/olefilter.h index 80a037373..f8c6203da 100644 --- a/filters/olefilters/olefilter.h +++ b/filters/olefilters/olefilter.h @@ -39,7 +39,7 @@ public: OLEFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~OLEFilter(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); public slots: void commSlotDelayStream( const char* delay ); diff --git a/filters/xsltfilter/export/xsltdialog.ui b/filters/xsltfilter/export/xsltdialog.ui index a52e922cd..ff542dc39 100644 --- a/filters/xsltfilter/export/xsltdialog.ui +++ b/filters/xsltfilter/export/xsltdialog.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>xsltList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/xsltfilter/export/xsltexport.cc b/filters/xsltfilter/export/xsltexport.cc index 545ffde2e..b1d9d84e6 100644 --- a/filters/xsltfilter/export/xsltexport.cc +++ b/filters/xsltfilter/export/xsltexport.cc @@ -40,7 +40,7 @@ XSLTExport::XSLTExport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus XSLTExport::convert( const TQCString& from, const TQCString&) +KoFilter::ConversionStatus XSLTExport::convert( const TQCString& from, const TQCString&) { if(from != "application/x-kword" && from != "application/x-kontour" && from != "application/x-kspread" && diff --git a/filters/xsltfilter/export/xsltexport.h b/filters/xsltfilter/export/xsltexport.h index eac9712ab..b9947255d 100644 --- a/filters/xsltfilter/export/xsltexport.h +++ b/filters/xsltfilter/export/xsltexport.h @@ -32,6 +32,6 @@ public: XSLTExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XSLTExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __XSLTEXPORT_H__ */ diff --git a/filters/xsltfilter/import/xsltdialog.ui b/filters/xsltfilter/import/xsltdialog.ui index a52e922cd..ff542dc39 100644 --- a/filters/xsltfilter/import/xsltdialog.ui +++ b/filters/xsltfilter/import/xsltdialog.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>xsltList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cc index e73bdf182..ee3fdf705 100644 --- a/filters/xsltfilter/import/xsltimport.cc +++ b/filters/xsltfilter/import/xsltimport.cc @@ -36,7 +36,7 @@ XSLTImport::XSLTImport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus XSLTImport::convert( const TQCString&, const TQCString& to ) +KoFilter::ConversionStatus XSLTImport::convert( const TQCString&, const TQCString& to ) { TQString config; diff --git a/filters/xsltfilter/import/xsltimport.h b/filters/xsltfilter/import/xsltimport.h index fead8d808..eac5e73c5 100644 --- a/filters/xsltfilter/import/xsltimport.h +++ b/filters/xsltfilter/import/xsltimport.h @@ -38,7 +38,7 @@ class XSLTImport : public KoFilter XSLTImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XSLTImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/karbon/core/vtext.h b/karbon/core/vtext.h index ef40ac28d..4f47f5270 100644 --- a/karbon/core/vtext.h +++ b/karbon/core/vtext.h @@ -70,7 +70,7 @@ public: virtual VSubpath& basePath() { return m_basePath; } virtual void setPosition( Position position ) { m_position = position; } virtual Position position() { return m_position; } - virtual void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; } + virtual void setAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; } virtual Alignment tqalignment() { return m_tqalignment; } virtual void setUseShadow( bool state ) { m_shadow = state; } virtual bool useShadow() { return m_shadow; } diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc index 98b0b8839..a029d2429 100644 --- a/karbon/dockers/vdocumentdocker.cc +++ b/karbon/dockers/vdocumentdocker.cc @@ -206,12 +206,12 @@ VDocumentPreview::paintEvent( TQPaintEvent* ) } TQPainter pw( &pixmap ); - pw.setPen( tqcolorGroup().light() ); + pw.setPen( colorGroup().light() ); pw.drawLine( 1, 1, 1, height() - 2 ); pw.drawLine( 1, 1, width() - 2, 1 ); pw.drawLine( width() - 1, height() - 1, 0, height() - 1 ); pw.drawLine( width() - 1, height() - 1, width() - 1, 0 ); - pw.setPen( tqcolorGroup().dark() ); + pw.setPen( colorGroup().dark() ); pw.drawLine( 0, 0, width() - 1, 0 ); pw.drawLine( 0, 0, 0, height() - 1 ); pw.drawLine( width() - 2, height() - 2, width() - 2, 1 ); @@ -247,10 +247,10 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent ) tqlayout->setColStretch( 2, 2 ); //tqlayout->addWidget( - m_width->tqsetAlignment( AlignRight ); - m_height->tqsetAlignment( AlignRight ); - m_layers->tqsetAlignment( AlignRight ); - m_format->tqsetAlignment( AlignRight ); + m_width->setAlignment( AlignRight ); + m_height->setAlignment( AlignRight ); + m_layers->setAlignment( AlignRight ); + m_format->setAlignment( AlignRight ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandAdded( VCommand* ) ), this, TQT_SLOT( slotCommandAdded( VCommand* ) ) ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) ); diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc index 5b7633b15..fd8cfb30d 100644 --- a/karbon/dockers/vstyledocker.cc +++ b/karbon/dockers/vstyledocker.cc @@ -263,7 +263,7 @@ ClipartWidget::importClipart() else { KoFilterManager man( m_part ); - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; TQString importedFile = man.import( fname, status ); if( status == KoFilter::OK ) m_part->mergeNativeFormat( importedFile ); diff --git a/karbon/karbon_drag.cpp b/karbon/karbon_drag.cpp index 3c60e94d8..3ef0772d7 100644 --- a/karbon/karbon_drag.cpp +++ b/karbon/karbon_drag.cpp @@ -46,7 +46,7 @@ KarbonDrag::format( int i ) const } TQByteArray -KarbonDrag::tqencodedData( const char* mimetype ) const +KarbonDrag::encodedData( const char* mimetype ) const { TQCString result; @@ -85,7 +85,7 @@ KarbonDrag::decode( TQMimeSource* e, VObjectList& sl, VDocument& vdoc ) if( e->provides( m_decodeFormats[0] ) ) { TQDomDocument doc( "clip" ); - TQByteArray data = e->tqencodedData( m_decodeFormats[0] ); + TQByteArray data = e->encodedData( m_decodeFormats[0] ); doc.setContent( TQCString( data, data.size()+1 ) ); TQDomElement clip = doc.documentElement(); // Try to parse the clipboard data diff --git a/karbon/karbon_drag.h b/karbon/karbon_drag.h index 0fb801196..f514b55db 100644 --- a/karbon/karbon_drag.h +++ b/karbon/karbon_drag.h @@ -36,7 +36,7 @@ class KarbonDrag : public TQDragObject public: KarbonDrag( TQWidget* dragSource = 0, const char* name = 0 ); const char* format( int i ) const; - TQByteArray tqencodedData( const char* mimetype ) const; + TQByteArray encodedData( const char* mimetype ) const; static bool canDecode( TQMimeSource * ); static bool decode( TQMimeSource* e, VObjectList& sl, VDocument& vdoc ); void setObjectList( VObjectList l ); diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc index 1d267e1b9..90c8c29ad 100644 --- a/karbon/karbon_factory.cc +++ b/karbon/karbon_factory.cc @@ -49,8 +49,8 @@ KarbonFactory::KarbonFactory( TQObject* parent, const char* name ) KarbonToolRegistry::instance(); // Load plugins - KTrader::OfferList offers = KTrader::self() -> query(TQString::tqfromLatin1("Karbon/CoreModule"), - TQString::tqfromLatin1("Type == 'Service'")); + KTrader::OfferList offers = KTrader::self() -> query(TQString::fromLatin1("Karbon/CoreModule"), + TQString::fromLatin1("Type == 'Service'")); KTrader::OfferList::ConstIterator iter; diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index 64dafd6a2..5e7ecb8b5 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -566,14 +566,14 @@ KarbonPart::paintContent( TQPainter& painter, const TQRect& rect, //VPainter *p = new VKoPainter( painter.device() ); p->begin(); p->setZoomFactor( zoomFactor ); - kdDebug(38000) << "painter.tqworldMatrix().dx() : " << painter.tqworldMatrix().dx() << endl; - kdDebug(38000) << "painter.tqworldMatrix().dy() : " << painter.tqworldMatrix().dy() << endl; + kdDebug(38000) << "painter.worldMatrix().dx() : " << painter.worldMatrix().dx() << endl; + kdDebug(38000) << "painter.worldMatrix().dy() : " << painter.worldMatrix().dy() << endl; kdDebug(38000) << "rect.x() : "<< rect.x() << endl; kdDebug(38000) << "rect.y() : "<< rect.y() << endl; kdDebug(38000) << "rect.width() : "<< rect.width() << endl; kdDebug(38000) << "rect.height() : "<< rect.height() << endl; r = document().boundingBox(); - TQWMatrix mat = painter.tqworldMatrix(); + TQWMatrix mat = painter.worldMatrix(); mat.scale( 1, -1 ); mat.translate( 0, -r.height() * zoomFactor ); p->setWorldMatrix( mat ); diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 333406902..79192129c 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -119,20 +119,20 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name ) setClientBuilder( this ); if( !p->isReadWrite() ) - setXMLFile( TQString::tqfromLatin1( "karbon_readonly.rc" ) ); + setXMLFile( TQString::fromLatin1( "karbon_readonly.rc" ) ); else - setXMLFile( TQString::tqfromLatin1( "karbon.rc" ) ); + setXMLFile( TQString::fromLatin1( "karbon.rc" ) ); m_dcop = 0L; dcopObject(); // build it // set up status bar message m_status = new KStatusBarLabel( TQString(), 0, statusBar() ); - m_status->tqsetAlignment( AlignLeft | AlignVCenter ); + m_status->setAlignment( AlignLeft | AlignVCenter ); m_status->setMinimumWidth( 300 ); addStatusBarItem( m_status, 1 ); m_cursorCoords = new KStatusBarLabel( TQString(), 0, statusBar() ); - m_cursorCoords->tqsetAlignment( AlignLeft | AlignVCenter ); + m_cursorCoords->setAlignment( AlignLeft | AlignVCenter ); m_cursorCoords->setMinimumWidth( 50 ); addStatusBarItem( m_cursorCoords, 0 ); m_smallPreview = new VSmallPreview( this, name ); @@ -462,7 +462,7 @@ KarbonView::fileImportGraphic() else { KoFilterManager man( part() ); - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; TQString importedFile = man.import( fname, status ); part()->mergeNativeFormat( importedFile ); if( !importedFile.isEmpty() ) diff --git a/karbon/karbon_view.h b/karbon/karbon_view.h index 13afd9f16..ac3dc8dd0 100644 --- a/karbon/karbon_view.h +++ b/karbon/karbon_view.h @@ -274,7 +274,7 @@ private: // dcop DCOPObject *m_dcop; - //tqStatus Bar + //Status Bar TQLabel *m_status; // Ordinary status TQLabel *m_cursorCoords; // Cursor coordinates VSmallPreview *m_smallPreview; // Stroke and Fill diff --git a/karbon/plugins/shadoweffect/vshadowdecorator.cc b/karbon/plugins/shadoweffect/vshadowdecorator.cc index b3c00bdd2..99ee8c8c3 100644 --- a/karbon/plugins/shadoweffect/vshadowdecorator.cc +++ b/karbon/plugins/shadoweffect/vshadowdecorator.cc @@ -69,7 +69,7 @@ VShadowDecorator::draw( VPainter* painter, const KoRect* rect ) const if( m_object->fill()->type() != VFill::none ) m_object->fill()->setColor( black ); m_object->stroke()->setColor( black ); - TQWMatrix mat = painter->tqworldMatrix(); + TQWMatrix mat = painter->worldMatrix(); painter->setWorldMatrix( mat.translate( shadowDx * painter->zoomFactor(), -shadowDy * painter->zoomFactor()) ); m_object->draw( painter, rect ); m_object->setFill( *fill ); diff --git a/karbon/render/vkopainter.h b/karbon/render/vkopainter.h index 75ac0bd16..eac4c2049 100644 --- a/karbon/render/vkopainter.h +++ b/karbon/render/vkopainter.h @@ -52,7 +52,7 @@ public: // matrix manipulation virtual void setWorldMatrix( const TQWMatrix & ); - virtual const TQWMatrix tqworldMatrix() { return m_matrix; } + virtual const TQWMatrix worldMatrix() { return m_matrix; } virtual void setZoomFactor( double ); virtual double zoomFactor() { return m_zoomFactor; } diff --git a/karbon/render/vpainter.h b/karbon/render/vpainter.h index 84ad9d135..b61d854a7 100644 --- a/karbon/render/vpainter.h +++ b/karbon/render/vpainter.h @@ -57,7 +57,7 @@ public: // matrix manipulation virtual void setWorldMatrix( const TQWMatrix & ) = 0; - virtual const TQWMatrix tqworldMatrix() = 0; + virtual const TQWMatrix worldMatrix() = 0; virtual void setZoomFactor( double ) = 0; virtual double zoomFactor() { return 1.0; } diff --git a/karbon/render/vqpainter.cc b/karbon/render/vqpainter.cc index 7f3802870..51819ae30 100644 --- a/karbon/render/vqpainter.cc +++ b/karbon/render/vqpainter.cc @@ -81,9 +81,9 @@ VTQPainter::end() } const TQWMatrix -VTQPainter::tqworldMatrix() +VTQPainter::worldMatrix() { - return m_painter->tqworldMatrix(); + return m_painter->worldMatrix(); } void @@ -153,13 +153,13 @@ VTQPainter::fillPath() { // we probably dont need filling for qpainter //m_index = 0; - m_painter->tqdrawPolygon( m_pa, FALSE, 0, m_index ); + m_painter->drawPolygon( m_pa, FALSE, 0, m_index ); } void VTQPainter::strokePath() { - m_painter->tqdrawPolyline( m_pa, 0, m_index ); + m_painter->drawPolyline( m_pa, 0, m_index ); m_index = 0; } @@ -265,7 +265,7 @@ VTQPainter::drawRect( const KoRect &rect ) void VTQPainter::drawImage( const TQImage &image, const TQWMatrix &affine ) { - TQWMatrix matrix = m_painter->tqworldMatrix(); + TQWMatrix matrix = m_painter->worldMatrix(); double m11 = affine.m11() * matrix.m11() * m_zoomFactor + affine.m12() * matrix.m21(); double m12 = (affine.m11() * matrix.m12() + affine.m12() * matrix.m22() ) * m_zoomFactor; diff --git a/karbon/render/vqpainter.h b/karbon/render/vqpainter.h index d1a556dbf..5cf3ecd12 100644 --- a/karbon/render/vqpainter.h +++ b/karbon/render/vqpainter.h @@ -44,7 +44,7 @@ public: // matrix manipulation virtual void setWorldMatrix( const TQWMatrix & ); - virtual const TQWMatrix tqworldMatrix(); + virtual const TQWMatrix worldMatrix(); virtual void setZoomFactor( double ); virtual double zoomFactor() { return m_zoomFactor; } diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc index a35001605..9a7790ba6 100644 --- a/karbon/tools/vtexttool.cc +++ b/karbon/tools/vtexttool.cc @@ -173,7 +173,7 @@ ShadowPreview::paintEvent( TQPaintEvent* ) p.lineTo( KoPoint( w, h ) ); p.lineTo( KoPoint( w, 0 ) ); p.lineTo( KoPoint( 0, 0 ) ); - VColor c( tqcolorGroup().background() ); + VColor c( colorGroup().background() ); c.setOpacity( .8 ); p.setBrush( VFill( c ) ); p.fillPath(); @@ -183,13 +183,13 @@ ShadowPreview::paintEvent( TQPaintEvent* ) TQPainter painter( this ); painter.drawPixmap( 2, 2, pm ); - painter.setPen( tqcolorGroup().light() ); + painter.setPen( colorGroup().light() ); painter.moveTo( 1, height() - 1 ); painter.lineTo( 1, 1 ); painter.lineTo( width() - 1, 1 ); painter.lineTo( width() - 1, height() - 1 ); painter.lineTo( 1, height() - 1 ); - painter.setPen( tqcolorGroup().dark() ); + painter.setPen( colorGroup().dark() ); painter.moveTo( 0, height() - 1 ); painter.lineTo( 0, 0 ); painter.lineTo( width() - 1, 0 ); @@ -205,7 +205,7 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d : TQGroupBox( parent, name ) { setTitle( i18n( "Shadow" ) ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); TQGridLayout* tqlayout = new TQGridLayout( this ); tqlayout->addRowSpacing( 0, 12 ); @@ -317,7 +317,7 @@ ShadowWidget::updatePreview() VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent ) : KDialogBase( parent, "", true, i18n( "Text" ), Ok | Cancel ), m_tool( tool ) { - //tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + //setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); //setFrameStyle( Box | Sunken ); TQWidget *base = new TQWidget( this ); TQVBoxLayout* mainLayout = new TQVBoxLayout( base ); @@ -518,7 +518,7 @@ VText::Position VTextOptionsWidget::position() } void -VTextOptionsWidget::tqsetAlignment( VText::Alignment tqalignment ) +VTextOptionsWidget::setAlignment( VText::Alignment tqalignment ) { m_textAlignment->setCurrentItem( tqalignment ); } @@ -803,7 +803,7 @@ VTextTool::textChanged() m_editedText->setText( m_optionsWidget->text() ); m_editedText->setFont( m_optionsWidget->font() ); m_editedText->setPosition( m_optionsWidget->position() ); - m_editedText->tqsetAlignment( m_optionsWidget->tqalignment() ); + m_editedText->setAlignment( m_optionsWidget->tqalignment() ); m_editedText->setOffset( 0.01 * m_optionsWidget->offset() ); #ifdef HAVE_KARBONTEXT m_editedText->traceText(); @@ -932,7 +932,7 @@ VTextTool::visitVText( VText& text ) m_optionsWidget->setFont( text.font() ); m_optionsWidget->setText( text.text() ); m_optionsWidget->setPosition( text.position() ); - m_optionsWidget->tqsetAlignment( text.tqalignment() ); + m_optionsWidget->setAlignment( text.tqalignment() ); m_optionsWidget->setOffset( text.offset() * 100.0 ); m_optionsWidget->setUseShadow( text.useShadow() ); m_optionsWidget->setShadow( text.shadowAngle(), text.shadowDistance(), text.translucentShadow() ); @@ -1007,7 +1007,7 @@ VTextTool::VTextCmd::execute() m_text->setFont( m_textModifications->newFont ); m_text->setBasePath( m_textModifications->newBasePath ); m_text->setPosition( m_textModifications->newPosition ); - m_text->tqsetAlignment( m_textModifications->newAlignment ); + m_text->setAlignment( m_textModifications->newAlignment ); m_text->setOffset( m_textModifications->newOffset ); m_text->setText( m_textModifications->newText ); m_text->setUseShadow( m_textModifications->newUseShadow ); @@ -1041,7 +1041,7 @@ VTextTool::VTextCmd::unexecute() m_text->setFont( m_textModifications->oldFont ); m_text->setBasePath( m_textModifications->oldBasePath ); m_text->setPosition( m_textModifications->oldPosition ); - m_text->tqsetAlignment( m_textModifications->oldAlignment ); + m_text->setAlignment( m_textModifications->oldAlignment ); m_text->setOffset( m_textModifications->oldOffset ); m_text->setText( m_textModifications->oldText ); m_text->setUseShadow( m_textModifications->oldUseShadow ); diff --git a/karbon/tools/vtexttool.h b/karbon/tools/vtexttool.h index cd3c4e87d..112894d69 100644 --- a/karbon/tools/vtexttool.h +++ b/karbon/tools/vtexttool.h @@ -113,7 +113,7 @@ public: TQString text(); void setPosition( VText::Position position ); VText::Position position(); - void tqsetAlignment( VText::Alignment tqalignment ); + void setAlignment( VText::Alignment tqalignment ); VText::Alignment tqalignment(); void setOffset( double offset ); double offset(); diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc index d96018b9b..d0a1b6b7d 100644 --- a/karbon/widgets/vcanvas.cc +++ b/karbon/widgets/vcanvas.cc @@ -228,7 +228,7 @@ VCanvas::viewportPaintEvent( TQPaintEvent *e ) setYMirroring( p ); // TRICK : slightly adjust the matrix so libart AA looks better - TQWMatrix mat = p->tqworldMatrix(); + TQWMatrix mat = p->worldMatrix(); p->setWorldMatrix( mat.translate( -.5, -.5 ) ); // set up clippath @@ -305,7 +305,7 @@ VCanvas::drawDocument( TQPainter* /*painter*/, const KoRect&, bool drawVObjects p->setZoomFactor( m_view->zoom() ); setYMirroring( p ); // TRICK : slightly adjust the matrix so libart AA looks better - TQWMatrix mat = p->tqworldMatrix(); + TQWMatrix mat = p->worldMatrix(); p->setWorldMatrix( mat.translate( -.5, -.5 ) ); m_part->document().drawPage( p, m_part->pageLayout(), m_view->showPageMargins() ); diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc index f65cfd74b..c90c655dc 100644 --- a/karbon/widgets/vgradienttabwidget.cc +++ b/karbon/widgets/vgradienttabwidget.cc @@ -93,9 +93,9 @@ void VGradientListItem::paint( TQPainter* painter ) painter->drawPixmap( 0, 0, m_pixmap ); painter->restore(); if ( isSelected() ) - painter->setPen( listBox()->tqcolorGroup().highlightedText() ); + painter->setPen( listBox()->colorGroup().highlightedText() ); else - painter->setPen( listBox()->tqcolorGroup().base() ); + painter->setPen( listBox()->colorGroup().base() ); painter->drawRect( r ); painter->flush(); } // VGradientListItem::paint @@ -151,13 +151,13 @@ void VGradientPreview::paintEvent( TQPaintEvent* ) TQPainter p( &pixmap ); - p.setPen( tqcolorGroup().light() ); + p.setPen( colorGroup().light() ); p.moveTo( 1, height() - 1 ); p.lineTo( 1, 1 ); p.lineTo( width() - 1, 1 ); p.lineTo( width() - 1, height() - 1 ); p.lineTo( 1, height() - 1 ); - p.setPen( tqcolorGroup().dark() ); + p.setPen( colorGroup().dark() ); p.moveTo( 0, height() - 1 ); p.lineTo( 0, 0 ); p.lineTo( width() - 1, 0 ); diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc index f1c55ea1c..7e9ecd756 100644 --- a/karbon/widgets/vgradientwidget.cc +++ b/karbon/widgets/vgradientwidget.cc @@ -117,7 +117,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) TQPainter p( &pixmap ); - p.setPen( tqcolorGroup().light() ); + p.setPen( colorGroup().light() ); // light frame around widget p.moveTo( 1, height() - 1 ); p.lineTo( 1, 1 ); @@ -129,7 +129,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) p.moveTo( 1, 3 + gh ); p.lineTo( width() - 1, 3 + gh ); - p.setPen( tqcolorGroup().dark() ); + p.setPen( colorGroup().dark() ); // left-top frame around widget p.moveTo( 0, height() - 1 ); p.lineTo( 0, 0 ); @@ -151,7 +151,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) m_pntArea.setRect( 2, height() - ph - 2, w, ph ); // clear point area - p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), tqcolorGroup().background() ); + p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), colorGroup().background() ); p.setClipRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height() ); p.translate( m_pntArea.x(), m_pntArea.y() ); @@ -244,7 +244,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) if( currentPoint % 2 == 1 ) { // ramp point hit -> change color - VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->tqtopLevelWidget() ); + VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->topLevelWidget() ); if( d->exec() == TQDialog::Accepted ) { m_gradient->m_colorStops.at( currentPoint / 2 )->color = d->Color(); @@ -256,7 +256,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) else if( currentPoint == 0 ) { // now point hit -> create new color stop - VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->tqtopLevelWidget() ); + VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->topLevelWidget() ); if( d->exec() == TQDialog::Accepted ) { m_gradient->addStop( d->Color(), (float)( e->x() - 2 ) / ( m_pntArea.width() ), 0.5 ); diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cc index de03eb235..0fd21cc1e 100644 --- a/karbon/widgets/vruler.cc +++ b/karbon/widgets/vruler.cc @@ -188,7 +188,7 @@ void VRuler::drawRuler() p.begin(m_pixmapBuffer); p.setPen(TQColor(0x70, 0x70, 0x70)); - p.setBackgroundColor(tqcolorGroup().background()); + p.setBackgroundColor(colorGroup().background()); p.eraseRect(0, 0, m_pixmapBuffer -> width(), m_pixmapBuffer -> height()); switch (m_unit) { diff --git a/karbon/widgets/vstrokefillpreview.h b/karbon/widgets/vstrokefillpreview.h index 1790c9c9e..53234b092 100644 --- a/karbon/widgets/vstrokefillpreview.h +++ b/karbon/widgets/vstrokefillpreview.h @@ -37,9 +37,9 @@ public: VStrokeFillPreview( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L ); ~VStrokeFillPreview(); - virtual TQSize tqsizeHint() const + virtual TQSize sizeHint() const { return TQSize( 50, 50 ); } - virtual TQSize tqminimumSizeHint() const + virtual TQSize minimumSizeHint() const { return TQSize( 20, 20 ); } virtual TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); } diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc index 38cfd8c2b..618f7b5a3 100644 --- a/kchart/csvimportdialog.cc +++ b/kchart/csvimportdialog.cc @@ -82,7 +82,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray) 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/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui index a061c0cc2..3ba48c10c 100644 --- a/kchart/csvimportdialogui.ui +++ b/kchart/csvimportdialogui.ui @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -274,7 +274,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -364,7 +364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -381,7 +381,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -557,7 +557,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>611</width> <height>20</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc index d56668027..cae1689bc 100644 --- a/kchart/kchartColorConfigPage.cc +++ b/kchart/kchartColorConfigPage.cc @@ -63,7 +63,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, { \ ++row; \ TQLabel* l = new TQLabel( title, gb ); \ - l->tqsetAlignment( labelAlign ); \ + l->setAlignment( labelAlign ); \ grid->addWidget( l, row, 0 ); \ btn = new KColorButton( gb ); \ l->setBuddy( btn ); \ @@ -140,7 +140,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, /*TQLabel* edgeLA = new TQLabel( i18n( "Edge color (pies only)" ), this ); - edgeLA->tqsetAlignment( AlignRight | AlignVCenter ); + edgeLA->setAlignment( AlignRight | AlignVCenter ); grid->addWidget( edgeLA, 6, 0 ); _edgeCB = new KColorButton( this ); grid->addWidget( _edgeCB, 6, 1 );*/ @@ -149,11 +149,11 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, // TQString labeltext; // labeltext.sprintf( i18n( "Data color #%d:"), i ); // TQLabel* dataLA = new TQLabel( labeltext, this ); -// dataLA->tqsetAlignment(AlignRight | AlignVCenter); -// dataLA->resize( dataLA->tqsizeHint() ); +// dataLA->setAlignment(AlignRight | AlignVCenter); +// dataLA->resize( dataLA->sizeHint() ); // grid->addWidget( dataLA, i, 2 ); // _dataCB[i] = new KColorButton( this ); -// _dataCB[i]->resize( _dataCB[i]->tqsizeHint() ); +// _dataCB[i]->resize( _dataCB[i]->sizeHint() ); // grid->addWidget( _dataCB[i], i, 3 ); // grid->addRowSpacing(i,_textCB->height()); // grid->setRowStretch(i,0); diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc index 724535841..4016e14ce 100644 --- a/kchart/kchartComboConfigPage.cc +++ b/kchart/kchartComboConfigPage.cc @@ -54,7 +54,7 @@ KChartComboPage::KChartComboPage( KChartParams* params, grid1->addWidget(connecting,2,0); icap=new TQRadioButton( i18n("Icap"), gb ); grid1->addWidget(icap,3,0); - gb->tqsetAlignment(TQt::AlignLeft); + gb->setAlignment(TQt::AlignLeft); grid1->addColSpacing(0,diamond->width()); grid1->addColSpacing(0,closeconnected->width()); grid1->addColSpacing(0,connecting->width()); diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc index 3766903c3..cbe1f30fa 100644 --- a/kchart/kchartDataConfigPage.cc +++ b/kchart/kchartDataConfigPage.cc @@ -82,10 +82,10 @@ KChartDataConfigPage::KChartDataConfigPage( KChartParams* params, TQButtonGroup *gb = new TQVButtonGroup( i18n( "Data Format" ), this ); m_rowMajor = new TQRadioButton( i18n( "Data in rows" ), gb ); - m_rowMajor->resize( m_rowMajor->tqsizeHint() ); + m_rowMajor->resize( m_rowMajor->sizeHint() ); m_colMajor = new TQRadioButton( i18n( "Data in columns" ), gb ); - m_colMajor->resize( m_colMajor->tqsizeHint() ); + m_colMajor->resize( m_colMajor->sizeHint() ); grid1->addWidget(gb, 2, 0); @@ -93,7 +93,7 @@ KChartDataConfigPage::KChartDataConfigPage( KChartParams* params, TQWhatsThis::add(m_rowMajor, i18n("By default one row is considered to be a data set and each column holds the individual values of the data series. This sets the data in rows on your chart.")); TQWhatsThis::add(m_colMajor, i18n("Here you can choose to have each column hold one data set. Note that the values are not really swapped but only their interpretation.")); - m_colMajor->resize( m_colMajor->tqsizeHint() ); + m_colMajor->resize( m_colMajor->sizeHint() ); grid1->addWidget(gb, 1, 0); grid1->setColStretch(3, 0); diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc index db1ce1f31..e264fbd0d 100644 --- a/kchart/kchartDataEditor.cc +++ b/kchart/kchartDataEditor.cc @@ -183,16 +183,16 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : // Create the Rows setting m_rowsLA = new TQLabel( i18n("# Rows:" ), page ); - m_rowsLA->resize( m_rowsLA->tqsizeHint() ); + m_rowsLA->resize( m_rowsLA->sizeHint() ); m_rowsSB = new kchartDataSpinBox( page ); - m_rowsSB->resize( m_rowsSB->tqsizeHint() ); + m_rowsSB->resize( m_rowsSB->sizeHint() ); m_rowsSB->setMinValue(1); // Create the columns setting m_colsLA = new TQLabel( i18n("# Columns:" ), page ); - m_colsLA->resize( m_colsLA->tqsizeHint() ); + m_colsLA->resize( m_colsLA->sizeHint() ); m_colsSB = new kchartDataSpinBox( page ); - m_colsSB->resize( m_colsSB->tqsizeHint() ); + m_colsSB->resize( m_colsSB->sizeHint() ); m_colsSB->setMinValue(1); #if 0 diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc index eef71cb65..846774c18 100644 --- a/kchart/kchartFontConfigPage.cc +++ b/kchart/kchartFontConfigPage.cc @@ -90,14 +90,14 @@ KChartFontConfigPage::KChartFontConfigPage( KChartParams* params, // The listbox m_list = new TQListBox(this); - m_list->resize( m_list->tqsizeHint() ); + m_list->resize( m_list->sizeHint() ); grid->addWidget(m_list, 0, 0); // Row 0-0, col 0-1 // The font button. m_fontButton = new TQPushButton( this); m_fontButton->setText(i18n("Font...")); TQWhatsThis::add(m_fontButton, i18n("Select an item in the list above and click on this button to display the KDE font dialog in order to choose a new font for this item.")); - m_fontButton->resize( m_fontButton->tqsizeHint() ); + m_fontButton->resize( m_fontButton->sizeHint() ); grid->addWidget( m_fontButton, 1, 0); #if 0 diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc index 39d99963b..d7583a354 100644 --- a/kchart/kchartLegendConfigPage.cc +++ b/kchart/kchartLegendConfigPage.cc @@ -98,7 +98,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, lBottomRightBottom= addButton( grid1, gb, i18n("Bottom-Right-Bottom"), "chart_legend_bottomrightbottom",4, 3 ); lBottomRight = addButton( grid1, gb, i18n("Bottom-Right"), "chart_legend_bottomright", 4, 4 ); - gb->tqsetAlignment( TQt::AlignLeft ); + gb->setAlignment( TQt::AlignLeft ); tqlayout->addMultiCellWidget( gb, 1,2, 0,0 ); // 3. Block: Font diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc index adf56a3d3..7b70ccfdb 100644 --- a/kchart/kchartLine3dConfigPage.cc +++ b/kchart/kchartLine3dConfigPage.cc @@ -67,7 +67,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, tmpLabel = new TQLabel( i18n( "Rotation around the X-axis in degrees:" ), this ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,4,0); angle3dX=new KIntNumInput(0, this, 10); @@ -75,7 +75,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, angle3dX->setRange(0, 90, 1); tmpLabel = new TQLabel( i18n( "Rotation around the Y-axis in degrees:" ), this ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,5,0); angle3dY=new KIntNumInput(0, this, 10); @@ -84,11 +84,11 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, tmpLabel = new TQLabel( i18n( "Depth:" ), this ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,6,0); depth=new KDoubleNumInput(0, this); - depth->resize(100,depth->tqsizeHint().height()); + depth->resize(100,depth->sizeHint().height()); grid1->addWidget(depth,6,1); depth->setRange(0,40, 0.1); #endif diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc index 760c97861..b1a0b1999 100644 --- a/kchart/kchartParameter3dConfigPage.cc +++ b/kchart/kchartParameter3dConfigPage.cc @@ -64,7 +64,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, grid1->addWidget(drawShadowColor,1,0); TQLabel *tmpLabel = new TQLabel( i18n( "Angle:" ), gb ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,2,0); angle3d=new KIntNumInput(0, gb, 10); @@ -73,16 +73,16 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, angle3d->setRange(0, 90, 1); tmpLabel = new TQLabel( i18n( "Depth:" ), gb ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,3,0); depth=new KDoubleNumInput(0, gb); TQWhatsThis::add(depth, i18n("You can set here the depth of the 3D effect from 0 to 2. 0 will give you no depth at all.\nDefault is 1.")); - depth->resize(100,depth->tqsizeHint().height()); + depth->resize(100,depth->sizeHint().height()); grid1->addWidget(depth,3,1); depth->setRange(0, 2.0, 0.1); - gb->tqsetAlignment(TQt::AlignLeft); + gb->setAlignment(TQt::AlignLeft); grid1->addColSpacing(0,depth->width()); grid1->addColSpacing(0,angle3d->width()); grid1->setColStretch(2,1); diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc index 9a71b9b1f..abef14c92 100644 --- a/kchart/kchartPieConfigPage.cc +++ b/kchart/kchartPieConfigPage.cc @@ -50,35 +50,35 @@ KChartPieConfigPage::KChartPieConfigPage( KChartParams* params, KDialog::spacingHint()); // The listview list = new TQListView( this ); - list->resize( list->tqsizeHint() ); + list->resize( list->sizeHint() ); grid->addMultiCellWidget(list,0,9,0,0); list->addColumn( i18n("Hide Piece") ); list->setRootIsDecorated( TRUE ); TQLabel* label = new TQLabel( i18n( "Column active:" ), this ); - label->resize( label->tqsizeHint() ); + label->resize( label->sizeHint() ); grid->addWidget( label,0,1); column = new TQSpinBox(1, data->cols(), 1, this); - column->resize(100, column->tqsizeHint().height() ); + column->resize(100, column->sizeHint().height() ); grid->addWidget( column,1,1); column->setValue(col+1); label = new TQLabel( i18n( "Move piece to:" ), this ); - label->resize( label->tqsizeHint() ); + label->resize( label->sizeHint() ); grid->addWidget( label,2,1); dist = new TQSpinBox(0, 400, 1, this); - dist->resize(100, dist->tqsizeHint().height() ); + dist->resize(100, dist->sizeHint().height() ); grid->addWidget( dist,3,1); label = new TQLabel( i18n( "Explode factor (%):" ), this ); - label->resize( label->tqsizeHint() ); + label->resize( label->sizeHint() ); grid->addWidget( label,4,1); explose = new TQSpinBox(0, 100, 1, this); - explose->resize(100, explose->tqsizeHint().height() ); + explose->resize(100, explose->sizeHint().height() ); grid->addWidget( explose,5,1); grid->addColSpacing(0,list->width()); diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc index 13585d7a6..0f7b4ca59 100644 --- a/kchart/kchartSubTypeChartPage.cc +++ b/kchart/kchartSubTypeChartPage.cc @@ -56,7 +56,7 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params, subtypeBG->insert( stacked, KDChartParams::AreaStacked ); percent = new TQRadioButton( i18n("HiLoOpenClose"), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); @@ -64,7 +64,7 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); // PENDING(kalle) Make image scale with available space once TQt 2.2 is out. } @@ -135,7 +135,7 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params, subtypeBG->insert( stacked, KDChartParams::AreaStacked ); percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); @@ -143,7 +143,7 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); // PENDING(kalle) Make image scale with available space once TQt 2.2 is out. } @@ -219,7 +219,7 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::BarPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); @@ -234,7 +234,7 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); } void KChartBarSubTypeChartPage::init() @@ -309,7 +309,7 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params, subtypeBG->insert( stacked, KDChartParams::AreaStacked ); percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); @@ -317,7 +317,7 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); // PENDING(kalle) Make image scale with available space once TQt 2.2 is out. } @@ -388,7 +388,7 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params, subtypeBG->insert( stacked, KDChartParams::AreaStacked ); percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); @@ -396,7 +396,7 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); // PENDING(kalle) Make image scale with available space once TQt 2.2 is out. } diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc index 9928c2dbf..dc4cbf8af 100644 --- a/kchart/kchartWizardSelectChartTypePage.cc +++ b/kchart/kchartWizardSelectChartTypePage.cc @@ -28,8 +28,8 @@ KChartButton::KChartButton(TQWidget *parent, const TQString & _text, const TQPix // The text TQLabel *label = new TQLabel(_text, this); - label->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); - tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed); + label->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed); } KChartButton::~KChartButton() diff --git a/kchart/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cc index 386062595..e7ab0ba82 100644 --- a/kchart/kchartWizardSelectDataFormatPage.cc +++ b/kchart/kchartWizardSelectDataFormatPage.cc @@ -51,10 +51,10 @@ KChartWizardSelectDataFormatPage::KChartWizardSelectDataFormatPage( TQWidget* pa TQButtonGroup *gb = new TQVButtonGroup( i18n( "Data Format" ), this ); m_rowMajor = new TQRadioButton( i18n( "Data in rows" ), gb ); - m_rowMajor->resize( m_rowMajor->tqsizeHint() ); + m_rowMajor->resize( m_rowMajor->sizeHint() ); m_colMajor = new TQRadioButton( i18n( "Data in columns" ), gb ); - m_colMajor->resize( m_colMajor->tqsizeHint() ); + m_colMajor->resize( m_colMajor->sizeHint() ); grid1->addWidget(gb, 3, 0); diff --git a/kchart/kchartWizardSetupDataPage.cc b/kchart/kchartWizardSetupDataPage.cc index b2ba26ac5..1d057d4ca 100644 --- a/kchart/kchartWizardSetupDataPage.cc +++ b/kchart/kchartWizardSetupDataPage.cc @@ -22,7 +22,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, tmpTQGroupBox = new TQButtonGroup( this, "GroupBox_1" ); tmpTQGroupBox->setGeometry( 260, 10, 130, 80 ); tmpTQGroupBox->setFrameStyle( 49 ); - tmpTQGroupBox->tqsetAlignment( 1 ); + tmpTQGroupBox->setAlignment( 1 ); datarow = new TQRadioButton( this, "RadioButton_1" ); datarow->setGeometry( 270, 40, 100, 20 ); @@ -57,7 +57,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, tmpTQLabel = new TQLabel( this, "Label_4" ); tmpTQLabel->setGeometry( 280, 110, 100, 30 ); tmpTQLabel->setText( i18n("Use first row as description") ); - tmpTQLabel->tqsetAlignment( 1313 ); + tmpTQLabel->setAlignment( 1313 ); rowdescript = new TQCheckBox( this, "CheckBox_4" ); rowdescript->setGeometry( 260, 150, 20, 30 ); @@ -69,7 +69,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, tmpTQLabel = new TQLabel( this, "Label_5" ); tmpTQLabel->setGeometry( 280, 150, 100, 30 ); tmpTQLabel->setText( i18n("Use first column as description") ); - tmpTQLabel->tqsetAlignment( 1313 ); + tmpTQLabel->setAlignment( 1313 ); TQFrame* tmpTQFrame; tmpTQFrame = new TQFrame( this, "Frame_1" ); diff --git a/kchart/kdchart/KDChart.cpp b/kchart/kdchart/KDChart.cpp index 415f013a7..5d0c6bf21 100644 --- a/kchart/kdchart/KDChart.cpp +++ b/kchart/kdchart/KDChart.cpp @@ -388,7 +388,7 @@ void KDChart::initInterpreter( TQSInterpreter* interpreter ) void KDChart::initProject( TQSProject* project ) { - project->createScript( TQString::tqfromLatin1( "KDCHART_Globals" ), globals() ); + project->createScript( TQString::fromLatin1( "KDCHART_Globals" ), globals() ); privateInitInterpreter( project->interpreter() ); } @@ -431,19 +431,19 @@ TQString KDChart::globals() for( TQMapIterator<char*,double> it= intMap.begin(); it != intMap.end(); ++it ) { // This is written this way to be efficient - globals += TQString::tqfromLatin1( "const " ); + globals += TQString::fromLatin1( "const " ); globals += it.key(); globals += " = "; globals += TQString::number( it.data() ); globals += ";\n"; } - globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" ) - .tqarg( TQString::tqfromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) ); - globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" ); - globals += TQString::tqfromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" ) + globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" ) + .tqarg( TQString::fromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) ); + globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" ); + globals += TQString::fromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" ) .tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name()); - globals += TQString::tqfromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" ) + globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" ) .tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name()); @@ -469,14 +469,14 @@ TQString KDChart::globals() colorMap.insert( "TQt.darkYellow", TQt::darkYellow ); for( TQMapIterator<char*,TQColor> it2= colorMap.begin(); it2 != colorMap.end(); ++it2 ) { // This is written this way to be efficient - globals += TQString::tqfromLatin1( it2.key() ); - globals += TQString::tqfromLatin1( " = new Color( " ); + globals += TQString::fromLatin1( it2.key() ); + globals += TQString::fromLatin1( " = new Color( " ); globals += TQString::number( it2.data().red() ); globals += ','; globals += TQString::number( it2.data().green() ); globals += ','; globals += TQString::number( it2.data().blue() ); - globals += TQString::tqfromLatin1( " );\n" ); + globals += TQString::fromLatin1( " );\n" ); } //qDebug( "%s",globals.latin1() ); return globals; diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp index 6124abe88..3f3b312a2 100644 --- a/kchart/kdchart/KDChartAxesPainter.cpp +++ b/kchart/kdchart/KDChartAxesPainter.cpp @@ -680,7 +680,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, anchor.setY( p2.y() + static_cast < int > ( pYDelta * (iLabel - 0.5) ) ); // allow for shearing and/or scaling of the painter - anchor = painter->tqworldMatrix().map( anchor ); + anchor = painter->worldMatrix().map( anchor ); TQString text; if( cv.isDateTime ){ @@ -1762,7 +1762,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, KDDrawText::drawRotatedText( painter, nRotation, - painter->tqworldMatrix().map( + painter->worldMatrix().map( TQPoint( static_cast<int>( cv.pTextsX ), static_cast<int>( cv.pTextsY ) ) ), label, @@ -4424,7 +4424,7 @@ void KDChartAxesPainter::paintData( TQPainter* painter, //ourClipRect.setLeft( ourClipRect.left() + 1 ); //ourClipRect.setRight( ourClipRect.right() - 1 ); - const TQWMatrix & world = painter->tqworldMatrix(); + const TQWMatrix & world = painter->worldMatrix(); ourClipRect = #if COMPAT_TQT_VERSION >= 0x030000 world.mapRect( ourClipRect ); diff --git a/kchart/kdchart/KDChartObjectFactory.cpp b/kchart/kdchart/KDChartObjectFactory.cpp index b1dac73ef..6e2a1284e 100644 --- a/kchart/kdchart/KDChartObjectFactory.cpp +++ b/kchart/kdchart/KDChartObjectFactory.cpp @@ -15,42 +15,42 @@ // PENDING(blackie) Clean up code in this file, so it uses the correct getter methods like getBool. KDChartObjectFactory::KDChartObjectFactory() { - registerClass( TQString::tqfromLatin1( "KDChartWidget" ) ); - registerClass( TQString::tqfromLatin1( "KDChartParams" ), new KDChartParams ); - registerClass( TQString::tqfromLatin1( "KDChartTableData" ) ); - registerClass( TQString::tqfromLatin1( "KDChartAxisParams" ), new KDChartAxisParams ); - registerClass( TQString::tqfromLatin1( "KDChartEnums" ), 0, new KDChartEnums ); - registerClass( TQString::tqfromLatin1( "KDChartTextPiece" ) ); - registerClass( TQString::tqfromLatin1( "KDChartCustomBox" ), new KDChartCustomBox ); - registerClass( TQString::tqfromLatin1( "KDChartPropertySet" ), new KDChartPropertySet ); - registerClass( TQString::tqfromLatin1( "KDFrame" ), TQString(), new KDFrame ); - - registerClass( TQString::tqfromLatin1( "TQt" ), TQString(), new TQtFactory() ); - registerClass( TQString::tqfromLatin1( "TQFont" ), TQString(), new TQFontFactory ); + registerClass( TQString::fromLatin1( "KDChartWidget" ) ); + registerClass( TQString::fromLatin1( "KDChartParams" ), new KDChartParams ); + registerClass( TQString::fromLatin1( "KDChartTableData" ) ); + registerClass( TQString::fromLatin1( "KDChartAxisParams" ), new KDChartAxisParams ); + registerClass( TQString::fromLatin1( "KDChartEnums" ), 0, new KDChartEnums ); + registerClass( TQString::fromLatin1( "KDChartTextPiece" ) ); + registerClass( TQString::fromLatin1( "KDChartCustomBox" ), new KDChartCustomBox ); + registerClass( TQString::fromLatin1( "KDChartPropertySet" ), new KDChartPropertySet ); + registerClass( TQString::fromLatin1( "KDFrame" ), TQString(), new KDFrame ); + + registerClass( TQString::fromLatin1( "TQt" ), TQString(), new TQtFactory() ); + registerClass( TQString::fromLatin1( "TQFont" ), TQString(), new TQFontFactory ); } TQObject* KDChartObjectFactory::create( const TQString& className, const TQSArgumentList& args, TQObject* /*context*/ ) { - if ( className == TQString::tqfromLatin1( "KDChartWidget" ) ) + if ( className == TQString::fromLatin1( "KDChartWidget" ) ) return createKDChartWidget( args ); - if ( className == TQString::tqfromLatin1("KDChartParams") ) + if ( className == TQString::fromLatin1("KDChartParams") ) return new KDChartParams(); - else if ( className == TQString::tqfromLatin1("KDChartTableData") ) + else if ( className == TQString::fromLatin1("KDChartTableData") ) return createKDChartTableData( args ); - else if ( className == TQString::tqfromLatin1("KDChartAxisParams") ) + else if ( className == TQString::fromLatin1("KDChartAxisParams") ) return new KDChartAxisParams(); - else if ( className == TQString::tqfromLatin1( "KDChartTextPiece" ) ) + else if ( className == TQString::fromLatin1( "KDChartTextPiece" ) ) return createKDChartTextPiece( args ); - else if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) ) + else if ( className == TQString::fromLatin1( "KDChartCustomBox" ) ) return createKDChartCustomBox( args ); - else if ( className == TQString::tqfromLatin1( "KDChartPropertySet" ) ) + else if ( className == TQString::fromLatin1( "KDChartPropertySet" ) ) return createKDChartPropertySet( args ); else @@ -98,7 +98,7 @@ TQObject* KDChartObjectFactory::createKDChartTextPiece( const TQSArgumentList& a TQString str; if ( !getString( args, 1, &str, "KDChartTextPiece" ) ) return 0; - if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::tqfromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0; + if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::fromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0; TQFont font = args[1].variant().toFont(); return new KDChartTextPiece( str, font ); @@ -145,13 +145,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a TQColor color = TQt::black; if ( args.count() >= 9 ) { - if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; + if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; color = args[8].variant().toColor(); } TQBrush paper = TQt::NoBrush; if ( args.count() >= 10 ) { - if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; + if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; paper = args[9].variant().toBrush(); } @@ -235,13 +235,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a TQColor color = TQt::black; if ( args.count() >= 8 ) { - if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; + if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; color = args[7].variant().toColor(); } TQBrush paper = TQt::NoBrush; if ( args.count() >= 9 ) { - if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; + if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; paper = args[8].variant().toBrush(); } @@ -318,7 +318,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& if ( !getNumber( args, 4,&idLineColor, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; TQColor lineColor = args[4].variant().toColor(); int idLineStyle; @@ -362,7 +362,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& int idExtraLinesColor; if ( !getNumber( args, 18,&idExtraLinesColor, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; TQColor extraLinesColor = args[18].variant().toColor(); int idExtraLinesStyle; @@ -380,13 +380,13 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& int idExtraMarkersSize; if ( !getNumber( args, 24,&idExtraMarkersSize, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::tqfromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::fromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0; TQSize extraMarkersSize = args[24].variant().toSize(); int idExtraMarkersColor; if ( !getNumber( args, 26,&idExtraMarkersColor, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; TQColor extraMarkersColor = args[26].variant().toColor(); int idExtraMarkersStyle; @@ -404,7 +404,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& int idBarColor; if ( !getNumber( args, 32,&idBarColor, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; TQColor barColor = args[32].variant().toColor(); KDChartPropertySet* set = new KDChartPropertySet; diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp index 156d5d823..df6085798 100644 --- a/kchart/kdchart/KDChartPainter.cpp +++ b/kchart/kdchart/KDChartPainter.cpp @@ -657,7 +657,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter, } if ( rotation ) { - anchor = painter->tqworldMatrix().map( anchor ); + anchor = painter->worldMatrix().map( anchor ); // Temporary solution for fixing the data labels size // bug when in TQPrinter::HighResolution mode: @@ -707,7 +707,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter, true, true, 5 ); - //anchor = painter->tqworldMatrix().map( anchor ); + //anchor = painter->worldMatrix().map( anchor ); if( allowOverlapping ) { drawThisOne = true; diff --git a/kchart/kdchart/KDChartPiePainter.cpp b/kchart/kdchart/KDChartPiePainter.cpp index ada03b44d..44f4c60c7 100644 --- a/kchart/kdchart/KDChartPiePainter.cpp +++ b/kchart/kdchart/KDChartPiePainter.cpp @@ -89,7 +89,7 @@ void KDChartPiePainter::paintData( TQPainter* painter, TQRect ourClipRect( _dataRect ); ourClipRect.addCoords( -1,-1,1,1 ); - const TQWMatrix & world = painter->tqworldMatrix(); + const TQWMatrix & world = painter->worldMatrix(); ourClipRect = #if COMPAT_TQT_VERSION >= 0x030000 world.mapRect( ourClipRect ); diff --git a/kchart/kdchart/KDChartPolarPainter.cpp b/kchart/kdchart/KDChartPolarPainter.cpp index 23430dbd3..9ebed8636 100644 --- a/kchart/kdchart/KDChartPolarPainter.cpp +++ b/kchart/kdchart/KDChartPolarPainter.cpp @@ -89,7 +89,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter, // PENDING(khz) adjust the clip rect if neccessary... // - const TQWMatrix & world = painter->tqworldMatrix(); + const TQWMatrix & world = painter->worldMatrix(); ourClipRect = #if COMPAT_TQT_VERSION >= 0x030000 world.mapRect( ourClipRect ); @@ -515,7 +515,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter, pt2 = center + polarToXY( r2, currentAngle ); pt3 = center + polarToXY( r3, currentAngle ); - //pt3 = painter->tqworldMatrix().map( pt3 ); + //pt3 = painter->worldMatrix().map( pt3 ); if( paraSagittal.axisShowGrid() ) { painter->setPen( TQPen( paraSagittal.axisGridColor(), @@ -538,7 +538,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter, KDDrawText::drawRotatedText( painter, currentAngle+90, - painter->tqworldMatrix().map(pt3), + painter->worldMatrix().map(pt3), label, 0, TQt::AlignCenter ); @@ -673,7 +673,7 @@ void KDChartPolarPainter::paintCircularAxisLabel( TQPainter* painter, KDDrawText::drawRotatedText( painter, rotate ? txtAngle - 90 : 0, - painter->tqworldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )), + painter->worldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )), txt, 0, step diff --git a/kchart/kdchart/KDChartRingPainter.cpp b/kchart/kdchart/KDChartRingPainter.cpp index 9740fa5ef..8797da5b1 100644 --- a/kchart/kdchart/KDChartRingPainter.cpp +++ b/kchart/kdchart/KDChartRingPainter.cpp @@ -84,7 +84,7 @@ void KDChartRingPainter::paintData( TQPainter* painter, TQRect ourClipRect( _dataRect ); - const TQWMatrix & world = painter->tqworldMatrix(); + const TQWMatrix & world = painter->worldMatrix(); ourClipRect = #if COMPAT_TQT_VERSION >= 0x030000 world.mapRect( ourClipRect ); diff --git a/kchart/kdchart/KDChartTableBase.cpp b/kchart/kdchart/KDChartTableBase.cpp index 1ebfa9fdf..fcec2c53e 100644 --- a/kchart/kdchart/KDChartTableBase.cpp +++ b/kchart/kdchart/KDChartTableBase.cpp @@ -74,7 +74,7 @@ future absicssa axis value: \verbatim - const TQDateTime currentTime( TQDateTime::tqcurrentDateTime() ); + const TQDateTime currentTime( TQDateTime::currentDateTime() ); for( int iCell = 0; iCell < usedValues; ++iCell ){ KDChartData& cell = myData.cell( 0, iCell ); // assign special property set ID if X value is in the future diff --git a/kchart/kdchart/KDChartWrapperFactory.cpp b/kchart/kdchart/KDChartWrapperFactory.cpp index 2ff08f1aa..b42c0379a 100644 --- a/kchart/kdchart/KDChartWrapperFactory.cpp +++ b/kchart/kdchart/KDChartWrapperFactory.cpp @@ -17,16 +17,16 @@ KDChartWrapperFactory::KDChartWrapperFactory() TQObject* KDChartWrapperFactory::create( const TQString& className, void* ptr ) { - if ( className == TQString::tqfromLatin1( "KDChartParams" ) ) + if ( className == TQString::fromLatin1( "KDChartParams" ) ) return new KDChartParamsWrapper( static_cast<KDChartParams*>( ptr ) ); - if ( className == TQString::tqfromLatin1( "KDChartVectorTableData" ) ) + if ( className == TQString::fromLatin1( "KDChartVectorTableData" ) ) return new KDChartTableDataWrapper( static_cast<KDChartTableData*>( ptr ) ); - if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) ) + if ( className == TQString::fromLatin1( "KDChartCustomBox" ) ) return new KDChartCustomBoxWrapper( static_cast<KDChartCustomBox*>( ptr ) ); - if ( className == TQString::tqfromLatin1( "KDChartAxisParams" ) ) + if ( className == TQString::fromLatin1( "KDChartAxisParams" ) ) return new KDChartAxisParamsWrapper( static_cast<KDChartAxisParams*>( ptr ) ); return 0; diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 9ba1dbd2e..8924ed33d 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -66,7 +66,7 @@ KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o, setMouseTracking( true ); } -TQSize KDGanttSplitterHandle::tqsizeHint() const +TQSize KDGanttSplitterHandle::sizeHint() const { return TQSize(8,8); } @@ -240,16 +240,16 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) TQPainter p( &buffer ); // Draw the splitter rectangle - p.setBrush( tqcolorGroup().background() ); - p.setPen( tqcolorGroup().foreground() ); + p.setBrush( colorGroup().background() ); + p.setPen( colorGroup().foreground() ); p.drawRect( rect() ); parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), - parentWidget()->tqcolorGroup()); + parentWidget()->colorGroup()); int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size // arrow color - TQColor col = tqcolorGroup().background().dark( 200 ); + TQColor col = colorGroup().background().dark( 200 ); p.setBrush( col ); p.setPen( col ); @@ -258,13 +258,13 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { if ( index == _activeButton ) { p.save(); - p.translate( parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ), - parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) ); - p.tqdrawPolygon( *it, true ); + p.translate( parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), + parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); + p.drawPolygon( *it, true ); p.restore(); } else { - p.tqdrawPolygon( *it, true ); + p.drawPolygon( *it, true ); } index++; } @@ -366,10 +366,10 @@ static TQSize minSize( const TQWidget* /*w*/ ) // This is the original version of minSize static TQSize minSizeHint( const TQWidget* w ) { - TQSize min = w->tqminimumSize(); + TQSize min = w->minimumSize(); TQSize s; if ( min.height() <= 0 || min.width() <= 0 ) - s = w->tqminimumSizeHint(); + s = w->minimumSizeHint(); if ( min.height() > 0 ) s.setHeight( min.height() ); if ( min.width() > 0 ) @@ -415,9 +415,9 @@ void KDGanttMinimizeSplitter::init() { data = new TQSplitterData; if ( orient ==Qt::Horizontal ) - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) ); else - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) ); } @@ -435,9 +435,9 @@ void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o ) orient = o; if ( orient ==Qt::Horizontal ) - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); else - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); KDGanttSplitterLayoutStruct *s = data->list.first(); while ( s ) { @@ -480,7 +480,7 @@ KDGanttSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bo s->wid = newHandle; newHandle->setId(data->list.count()); s->isSplitter = TRUE; - s->sizer = pick( newHandle->tqsizeHint() ); + s->sizer = pick( newHandle->sizeHint() ); if ( first ) data->list.insert( 0, s ); else @@ -489,8 +489,8 @@ KDGanttSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bo s = new KDGanttSplitterLayoutStruct; s->mode = Stretch; s->wid = w; - if ( !testWState( WState_Resized ) && w->tqsizeHint().isValid() ) - s->sizer = pick( w->tqsizeHint() ); + if ( !testWState( WState_Resized ) && w->sizeHint().isValid() ) + s->sizer = pick( w->sizeHint() ); else s->sizer = pick( w->size() ); s->isSplitter = FALSE; @@ -563,7 +563,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) paint.setRasterOp( XorROP ); TQRect r = contentsRect(); const int rBord = 3; //Themable???? - int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( orient ==Qt::Horizontal ) { if ( opaqueOldPos >= 0 ) paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), @@ -603,7 +603,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h ) { - tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), tqcolorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), (orientation() == Qt::Horizontal ? TQStyle::Style_Horizontal : 0)); } @@ -708,12 +708,12 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) int dd, newLeft, nextPos; if( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { dd = w->tqgeometry().right() - pos; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos+1; nextPos = newLeft + dd; } else { dd = pos - pick( w->pos() ) + 1; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos-dd+1; nextPos = newLeft - 1; } @@ -762,13 +762,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) int right, dd,/* newRight,*/ newLeft, nextPos; if ( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { dd = pos - left + 1; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos-dd+1; nextPos = newLeft - 1; } else { right = pick( w->tqgeometry().bottomRight() ); dd = right - pos + 1; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); /*newRight = pos+dd-1;*/ newLeft = pos; nextPos = newLeft + dd; @@ -822,7 +822,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) maxB += s->sizer; } else { minB += pick( minSize(s->wid) ); - maxB += pick( s->wid->tqmaximumSize() ); + maxB += pick( s->wid->maximumSize() ); } } for ( i = id; i < n; i++ ) { @@ -834,12 +834,12 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) maxA += s->sizer; } else { minA += pick( minSize(s->wid) ); - maxA += pick( s->wid->tqmaximumSize() ); + maxA += pick( s->wid->maximumSize() ); } } TQRect r = contentsRect(); if ( orient ==Qt::Horizontal && TQApplication::reverseLayout() ) { - int splitterWidth = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this); + int splitterWidth = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( min ) *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth; if ( max ) @@ -881,27 +881,27 @@ void KDGanttMinimizeSplitter::doResize() KDGanttSplitterLayoutStruct *s = data->list.at(i); if ( s->wid->isHidden() ) { a[i].stretch = 0; - a[i].tqsizeHint = a[i].tqminimumSize = 0; - a[i].tqmaximumSize = 0; + a[i].sizeHint = a[i].minimumSize = 0; + a[i].maximumSize = 0; } else if ( s->isSplitter ) { a[i].stretch = 0; - a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer; + a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer; a[i].empty = FALSE; } else if ( s->mode == KeepSize ) { a[i].stretch = 0; - a[i].tqminimumSize = pick( minSize(s->wid) ); - a[i].tqsizeHint = s->sizer; - a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() ); + a[i].minimumSize = pick( minSize(s->wid) ); + a[i].sizeHint = s->sizer; + a[i].maximumSize = pick( s->wid->maximumSize() ); a[i].empty = FALSE; } else if ( s->mode == FollowSizeHint ) { a[i].stretch = 0; - a[i].tqminimumSize = a[i].tqsizeHint = pick( s->wid->tqsizeHint() ); - a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() ); + a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() ); + a[i].maximumSize = pick( s->wid->maximumSize() ); a[i].empty = FALSE; } else { //proportional a[i].stretch = s->sizer; - a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() ); - a[i].tqsizeHint = a[i].tqminimumSize = pick( minSize(s->wid) ); + a[i].maximumSize = pick( s->wid->maximumSize() ); + a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) ); a[i].empty = FALSE; } } @@ -955,9 +955,9 @@ void KDGanttMinimizeSplitter::recalc( bool update ) } else { TQSize minS = minSize(s->wid); minl += pick( minS ); - maxl += pick( s->wid->tqmaximumSize() ); + maxl += pick( s->wid->maximumSize() ); mint = TQMAX( mint, trans( minS )); - int tm = trans( s->wid->tqmaximumSize() ); + int tm = trans( s->wid->maximumSize() ); if ( tm > 0 ) maxt = TQMIN( maxt, tm ); } @@ -1107,7 +1107,7 @@ void KDGanttMinimizeSplitter::recalcId() /*! Reimplemented from superclass. */ -TQSize KDGanttMinimizeSplitter::tqsizeHint() const +TQSize KDGanttMinimizeSplitter::sizeHint() const { constPolish(); int l = 0; @@ -1121,7 +1121,7 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const ++it; if ( o->isWidgetType() && !((TQWidget*)o)->isHidden() ) { - TQSize s = ((TQWidget*)o)->tqsizeHint(); + TQSize s = ((TQWidget*)o)->sizeHint(); if ( s.isValid() ) { l += pick( s ); t = TQMAX( t, trans( s ) ); @@ -1137,7 +1137,7 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const \reimp */ -TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const +TQSize KDGanttMinimizeSplitter::minimumSizeHint() const { constPolish(); int l = 0; @@ -1311,7 +1311,7 @@ void KDGanttMinimizeSplitter::processChildEvents() void KDGanttMinimizeSplitter::styleChange( TQStyle& old ) { - int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); KDGanttSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->isSplitter ) @@ -1366,9 +1366,9 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int i; for ( i = start; i < start + count; i++ ) { chain[i].done = FALSE; - cHint += chain[i].tqsizeHint; - cMin += chain[i].tqminimumSize; - cMax += chain[i].tqmaximumSize; + cHint += chain[i].sizeHint; + cMin += chain[i].minimumSize; + cMax += chain[i].maximumSize; sumStretch += chain[i].stretch; if ( !chain[i].empty ) spacerCount++; @@ -1381,11 +1381,11 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( space < cMin + spacerCount * spacer ) { // qDebug("not enough space"); for ( i = start; i < start+count; i++ ) { - chain[i].size = chain[i].tqminimumSize; + chain[i].size = chain[i].minimumSize; chain[i].done = TRUE; } } else if ( space < cHint + spacerCount*spacer ) { - // Less space than tqsizeHint, but more than minimum. + // Less space than sizeHint, but more than minimum. // Currently take space equally from each, like in TQt 2.x. // Commented-out lines will give more space to stretchier items. int n = count; @@ -1393,10 +1393,10 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int overdraft = cHint - space_left; //first give to the fixed ones: for ( i = start; i < start+count; i++ ) { - if ( !chain[i].done && chain[i].tqminimumSize >= chain[i].tqsizeHint) { - chain[i].size = chain[i].tqsizeHint; + if ( !chain[i].done && chain[i].minimumSize >= chain[i].sizeHint) { + chain[i].size = chain[i].sizeHint; chain[i].done = TRUE; - space_left -= chain[i].tqsizeHint; + space_left -= chain[i].sizeHint; // sumStretch -= chain[i].stretch; n--; } @@ -1415,13 +1415,13 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i // else // fp_w += (fp_over * chain[i].stretch) / sumStretch; int w = fRound( fp_w ); - chain[i].size = chain[i].tqsizeHint - w; + chain[i].size = chain[i].sizeHint - w; fp_w -= toFixed( w ); //give the difference to the next - if ( chain[i].size < chain[i].tqminimumSize ) { + if ( chain[i].size < chain[i].minimumSize ) { chain[i].done = TRUE; - chain[i].size = chain[i].tqminimumSize; + chain[i].size = chain[i].minimumSize; finished = FALSE; - overdraft -= chain[i].tqsizeHint - chain[i].tqminimumSize; + overdraft -= chain[i].sizeHint - chain[i].minimumSize; // sumStretch -= chain[i].stretch; n--; break; @@ -1433,11 +1433,11 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int space_left = space - spacerCount*spacer; // first give to the fixed ones, and handle non-expansiveness for ( i = start; i < start + count; i++ ) { - if ( !chain[i].done && (chain[i].tqmaximumSize <= chain[i].tqsizeHint + if ( !chain[i].done && (chain[i].maximumSize <= chain[i].sizeHint || wannaGrow && !chain[i].expansive) ) { - chain[i].size = chain[i].tqsizeHint; + chain[i].size = chain[i].sizeHint; chain[i].done = TRUE; - space_left -= chain[i].tqsizeHint; + space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; } @@ -1469,20 +1469,20 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int w = fRound( fp_w ); chain[i].size = w; fp_w -= toFixed( w ); // give the difference to the next - if ( w < chain[i].tqsizeHint ) { - deficit += chain[i].tqsizeHint - w; - } else if ( w > chain[i].tqmaximumSize ) { - surplus += w - chain[i].tqmaximumSize; + if ( w < chain[i].sizeHint ) { + deficit += chain[i].sizeHint - w; + } else if ( w > chain[i].maximumSize ) { + surplus += w - chain[i].maximumSize; } } if ( deficit > 0 && surplus <= deficit ) { // give to the ones that have too little for ( i = start; i < start+count; i++ ) { if ( !chain[i].done && - chain[i].size < chain[i].tqsizeHint ) { - chain[i].size = chain[i].tqsizeHint; + chain[i].size < chain[i].sizeHint ) { + chain[i].size = chain[i].sizeHint; chain[i].done = TRUE; - space_left -= chain[i].tqsizeHint; + space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; } @@ -1492,10 +1492,10 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i // take from the ones that have too much for ( i = start; i < start+count; i++ ) { if ( !chain[i].done && - chain[i].size > chain[i].tqmaximumSize ) { - chain[i].size = chain[i].tqmaximumSize; + chain[i].size > chain[i].maximumSize ) { + chain[i].size = chain[i].maximumSize; chain[i].done = TRUE; - space_left -= chain[i].tqmaximumSize; + space_left -= chain[i].maximumSize; sumStretch -= chain[i].stretch; n--; } diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index 557026f10..7a56d7ce4 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -72,8 +72,8 @@ public: void moveToLast( TQWidget * ); void refresh() { recalc( TRUE ); } - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; TQValueList<int> sizes() const; void setSizes( TQValueList<int> ); @@ -149,7 +149,7 @@ public: bool opaque() const { return s->opaqueResize(); } - TQSize tqsizeHint() const; + TQSize sizeHint() const; int id() const { return myId; } // data->list.at(id())->wid == this void setId( int i ) { myId = i; } diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 8bede0d04..8fa33775f 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -247,7 +247,7 @@ KDGanttSemiSizingControl::ArrowPosition KDGanttSemiSizingControl::arrowPosition( void KDGanttSemiSizingControl::init() { _but = new TQPushButton( this ); - _but->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) ); _layout = 0; TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget"); @@ -395,7 +395,7 @@ TQPixmap KDGanttSemiSizingControl::pixmap( Direction direction ) { TQPainter p( &pix ); p.setPen( black ); - p.setBrush( tqcolorGroup().button() ); + p.setBrush( colorGroup().button() ); p.drawPolygon( arr ); TQBitmap bit( s, s ); bit.fill( color0 ); diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index f14ac0272..45b1b976c 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -186,7 +186,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) fDropEnabled = false; closingBlocked = false; myTimeHeader->computeTicks(); - centerTimelineAfterShow( TQDateTime::tqcurrentDateTime () ); + centerTimelineAfterShow( TQDateTime::currentDateTime () ); setDisplayEmptyTasksAsLine( false ); TQValueList<int> list; list.append(240); @@ -313,12 +313,12 @@ bool KDGanttView::close ( bool alsoDelete ) /*! Returns a useful size for the view. Returned width: - tqsizeHint().width() of the list view + width of TimeTable + sizeHint().width() of the list view + width of TimeTable Returned height: height() of TimeHeader + height() of TimeTable + height() of Legend (if shown) */ -TQSize KDGanttView::tqsizeHint() const +TQSize KDGanttView::sizeHint() const { bool block = myTimeTable->blockUpdating(); myTimeTable->setBlockUpdating( false ); @@ -342,9 +342,9 @@ TQSize KDGanttView::tqsizeHint() const if ( myLegend->isShown() ) hintHeight += myLegend->legendSizeHint().height() +10; hintHeight += myTimeTable->minimumHeight+myListView->frameWidth()*2+2; - int hintWid = myListView->tqsizeHint().width(); + int hintWid = myListView->sizeHint().width(); //hintWid += myTimeHeader->mySizeHint+myCanvasView->verticalScrollBar()->width(); - hintWid += myCanvasView->tqsizeHint().width(); + hintWid += myCanvasView->sizeHint().width(); // add 10 for the splitter-bars // qDebug("sizehint %d %d ",hintWid+10, hintHeight ); myTimeTable->setBlockUpdating( block ); @@ -875,7 +875,7 @@ void KDGanttView::print( TQPrinter* printer , TQSize size = drawContents( 0, printListView, printTimeLine, printLegend ); // at the top, we want to print current time/date - TQString date = "Printing Time: " + TQDateTime::tqcurrentDateTime().toString(); + TQString date = "Printing Time: " + TQDateTime::currentDateTime().toString(); int hei = p.boundingRect(0,0, 5, 5, TQt::AlignLeft, date ).height(); p.drawText( 0, 0, date ); diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h index 02fdc5d71..d272e3827 100644 --- a/kdgantt/KDGanttView.h +++ b/kdgantt/KDGanttView.h @@ -325,7 +325,7 @@ public: virtual void lvStartDrag (KDGanttViewItem*); virtual bool lvDragMoveEvent (TQDragMoveEvent * e,KDGanttViewItem*, KDGanttViewItem*); virtual void lvDragEnterEvent (TQDragEnterEvent * e ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; KDGanttViewItem* getItemByName( const TQString& name ) const; TQDateTime getDateTimeForCoordX(int coordX, bool global = true ) const; KDGanttViewItem* getItemByListViewPos( const TQPoint& pos ) const; diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp index c73eff67f..92c602011 100644 --- a/kdgantt/KDGanttViewItemDrag.cpp +++ b/kdgantt/KDGanttViewItemDrag.cpp @@ -86,7 +86,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour \param c the format of the data \return the encoded data of the drag object */ -TQByteArray KDGanttViewItemDrag::tqencodedData( const char * c) const +TQByteArray KDGanttViewItemDrag::encodedData( const char * c) const { TQString s ( c ); if ( s == "x-application/x-KDGanttViewItemDrag" ) { @@ -132,7 +132,7 @@ bool KDGanttViewItemDrag::canDecode ( const TQMimeSource * e ) bool KDGanttViewItemDrag::decode ( const TQMimeSource * e , TQString & string) { TQByteArray arr; - arr = e->tqencodedData( "x-application/x-KDGanttViewItemDrag"); + arr = e->encodedData( "x-application/x-KDGanttViewItemDrag"); TQDataStream s( arr, IO_ReadOnly ); s >> string; return true; diff --git a/kdgantt/KDGanttViewItemDrag.h b/kdgantt/KDGanttViewItemDrag.h index a4d6cb6f0..9219c9181 100644 --- a/kdgantt/KDGanttViewItemDrag.h +++ b/kdgantt/KDGanttViewItemDrag.h @@ -44,7 +44,7 @@ class KDGanttViewItemDrag :public TQStoredDrag public: KDGanttViewItemDrag(KDGanttViewItem* item, TQWidget *source, const char * name ) ; - TQByteArray tqencodedData( const char * c) const; + TQByteArray encodedData( const char * c) const; KDGanttViewItem* getItem(); static bool canDecode ( const TQMimeSource * e ); static bool decode ( const TQMimeSource * e, TQString & ); diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index d158c75a5..ab8b5a92f 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -702,12 +702,12 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant ) mySizeHint = 0; myGanttView = gant; flagDoNotRecomputeAfterChange = true; - TQDateTime start = (TQDateTime::tqcurrentDateTime ()).addSecs(-3600); + TQDateTime start = (TQDateTime::currentDateTime ()).addSecs(-3600); setHorizonStart(start); setHorizonEnd( start.addSecs(3600*2)); flagStartTimeSet = false; flagEndTimeSet = false; - myCenterDateTime = TQDateTime::tqcurrentDateTime (); + myCenterDateTime = TQDateTime::currentDateTime (); setScale(KDGanttView::Auto); //setScale(KDGanttView::Hour); myMaxScale = KDGanttView::Month; @@ -2098,7 +2098,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) TQPainter p(this); int Width, Height; TQString testTextMinor,testTextMajor, tempStr; - TQRect tqitemRectMinor, tqitemRectMajor; + TQRect itemRectMinor, itemRectMajor; TQDate tempDate = myRealStart.date(); myRealEnd = myRealStart; // preparing the testtext for the differennt scales @@ -2121,25 +2121,25 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) testTextMinor = "12 AM"; testTextMajor = "Mon Aug 30, x"; if ( yearFormat() != KDGanttView::NoDate ) - testTextMajor += getYear(TQDate::tqcurrentDate()); + testTextMajor += getYear(TQDate::currentDate()); minorPerMajor = 2400; break; case KDGanttView::Day: minorItems = minorItems/(60*24); testTextMinor = "88"; - testTextMajor = "Aug 30, x"+getYear(TQDate::tqcurrentDate()); + testTextMajor = "Aug 30, x"+getYear(TQDate::currentDate()); minorPerMajor = 700; break; case KDGanttView::Week: minorItems = minorItems/(60*24*7); testTextMinor = "88"; - testTextMajor = "Aug x"+getYear(TQDate::tqcurrentDate()); + testTextMajor = "Aug x"+getYear(TQDate::currentDate()); minorPerMajor = 435; // 435 = 365days/12months/7days * 100 break; case KDGanttView::Month: minorItems = (minorItems*12)/(60*24*365); testTextMinor = "M"; - testTextMajor = "x"+getYear(TQDate::tqcurrentDate()); + testTextMajor = "x"+getYear(TQDate::currentDate()); minorPerMajor = 1200; break; case KDGanttView::Auto: @@ -2147,12 +2147,12 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) qDebug(" RealScale == Auto : This may not be! "); break; } - tqitemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor); - tqitemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor); + itemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor); + itemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor); p.end(); //qDebug(" tempMinorScaleCount %d ", tempMinorScaleCount); - Height = tqitemRectMinor.height()+tqitemRectMajor.height()+11; - Width = (tqitemRectMinor.width()+5); + Height = itemRectMinor.height()+itemRectMajor.height()+11; + Width = (itemRectMinor.width()+5); if (Width < minimumColumnWidth()) Width = minimumColumnWidth(); // if the desired width is greater than the maximum width of this widget // increase the minorscalecount @@ -2209,7 +2209,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) // checking, if enough space for majorscale // if not, increasing MajorScaleCount - while ((minorPerMajor*Width)/100 < tqitemRectMajor.width()) { + while ((minorPerMajor*Width)/100 < itemRectMajor.width()) { minorPerMajor = minorPerMajor/tempMajorScaleCount; ++tempMajorScaleCount; minorPerMajor = minorPerMajor*tempMajorScaleCount; @@ -2225,7 +2225,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) resize( Width, Height ); emit sizeChanged( Width ); } - myMajorGridHeight = tqitemRectMajor.height()+5; + myMajorGridHeight = itemRectMajor.height()+5; TQTime tempTime = myRealStart.time(); TQDateTime tempDateTime; int i; @@ -2643,7 +2643,7 @@ TQSize KDLegendWidget::legendSize() TQSize KDLegendWidget::legendSizeHint() { TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); - return TQSize( myLegend->tqsizeHint().width(), myLegend->tqsizeHint().height()+scroll->horizontalScrollBar()->height()); + return TQSize( myLegend->sizeHint().width(), myLegend->sizeHint().height()+scroll->horizontalScrollBar()->height()); } @@ -2961,7 +2961,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) p->translate( rleft, crtop ); //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl; - current->i->paintBranches( p, tqcolorGroup(), treeStepSize(), + current->i->paintBranches( p, colorGroup(), treeStepSize(), rtop - crtop, r.height() ); p->restore(); } @@ -3506,7 +3506,7 @@ TQString KDGanttCanvasView::getWhatsThisText(TQPoint p) void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) { //qDebug("mousepress! %d ", this); - //qDebug("focus %d ",tqApp->tqfocusWidget()); + //qDebug("focus %d ",tqApp->focusWidget()); setFocus(); currentLink = 0; currentItem = 0; diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui index a3616dcad..a98d65a11 100644 --- a/kdgantt/itemAttributeDialog.ui +++ b/kdgantt/itemAttributeDialog.ui @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h index e87eb5de2..4042e218f 100644 --- a/kdgantt/qlayoutengine_p.h +++ b/kdgantt/qlayoutengine_p.h @@ -62,15 +62,15 @@ #ifndef TQT_NO_LAYOUT struct QLayoutStruct { - void initParameters() { tqminimumSize = tqsizeHint = 0; - tqmaximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } + void initParameters() { minimumSize = sizeHint = 0; + maximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } void init() { stretch = 0; initParameters(); } //permanent storage: int stretch; //parameters: - TQCOORD tqsizeHint; - TQCOORD tqmaximumSize; - TQCOORD tqminimumSize; + TQCOORD sizeHint; + TQCOORD maximumSize; + TQCOORD minimumSize; bool expansive; bool empty; //temporary storage: diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui index 325fe45e7..07cced255 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui +++ b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui index b3bd79783..41246d840 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui +++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp index 649f4c26f..ce6f8f3b3 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp @@ -159,9 +159,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou // ------------- spacers ----------- TQWidget* spacer1 = new TQWidget( this ); TQWidget* spacer2 = new TQWidget( this ); - spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); grid1->addWidget( spacer1, 4, 0 ); grid1->addWidget( spacer2, 4, 1 ); diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index 3541e6ea2..a88e3bcd6 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -133,7 +133,7 @@ void KoGlobal::createListOfLanguages() // currently have en_GB or en_US etc. const TQStringList translationList = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); for ( TQStringList::ConstIterator it = translationList.begin(); it != translationList.end(); ++it ) { diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp index 7888ba7de..682a26d67 100644 --- a/kexi/3rdparty/kolibs/koPageLayout.cpp +++ b/kexi/3rdparty/kolibs/koPageLayout.cpp @@ -200,15 +200,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height ) TQString KoPageFormat::formatString( KoFormat format ) { if ( format <= PG_LAST_FORMAT ) - return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName ); - return TQString::tqfromLatin1( "A4" ); + return TQString::fromLatin1( pageFormatInfo[ format ].shortName ); + return TQString::fromLatin1( "A4" ); } KoFormat KoPageFormat::formatFromString( const TQString & string ) { for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i ) { - if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName )) + if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName )) return pageFormatInfo[ i ].format; } // We do not know the format name, so we have a custom format diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc index 506e24e15..e8dd16ff6 100644 --- a/kexi/3rdparty/kolibs/koUnit.cc +++ b/kexi/3rdparty/kolibs/koUnit.cc @@ -185,15 +185,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) { if ( ok ) *ok = true; - if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM; - if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM; - if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM; - if ( _unitName == TQString::tqfromLatin1( "in" ) - || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH; - if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI; - if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD; - if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC; - if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT; + if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM; + if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM; + if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM; + if ( _unitName == TQString::fromLatin1( "in" ) + || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH; + if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI; + if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD; + if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC; + if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT; if ( ok ) *ok = false; return U_PT; @@ -201,14 +201,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) TQString KoUnit::unitName( Unit _unit ) { - if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" ); - if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" ); - if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" ); - if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" ); - if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" ); - if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" ); - if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" ); - return TQString::tqfromLatin1( "pt" ); + if ( _unit == U_MM ) return TQString::fromLatin1( "mm" ); + if ( _unit == U_CM ) return TQString::fromLatin1( "cm" ); + if ( _unit == U_DM ) return TQString::fromLatin1( "dm" ); + if ( _unit == U_INCH ) return TQString::fromLatin1( "in" ); + if ( _unit == U_PI ) return TQString::fromLatin1( "pi" ); + if ( _unit == U_DD ) return TQString::fromLatin1( "dd" ); + if ( _unit == U_CC ) return TQString::fromLatin1( "cc" ); + return TQString::fromLatin1( "pt" ); } #ifndef SIMPLE_KOLIBS diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc index 16ec9a557..2b4b76b75 100644 --- a/kexi/3rdparty/kolibs/koUnitWidgets.cc +++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc @@ -222,7 +222,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name ) : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, this ); setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -234,7 +234,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, this ); setValidator( m_validator ); setUnit( unit ); @@ -286,7 +286,7 @@ double KoUnitDoubleLineEdit::value( void ) const KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, this ); lineEdit()->setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -299,7 +299,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, this ); lineEdit()->setValidator( m_validator ); setUnit( unit ); diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index 24cd08e83..d8be52491 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -172,47 +172,47 @@ TQString Kexi::msgYouCanImproveData() { //-------------------------------------------------------------------------------- -ObjecttqStatus::ObjecttqStatus() +ObjectStatus::ObjectStatus() : msgHandler(0) { } -ObjecttqStatus::ObjecttqStatus(const TQString& message, const TQString& description) +ObjectStatus::ObjectStatus(const TQString& message, const TQString& description) : msgHandler(0) { - settqStatus(message, description); + setStatus(message, description); } -ObjecttqStatus::ObjecttqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description) +ObjectStatus::ObjectStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description) : msgHandler(0) { - settqStatus(dbObject, message, description); + setStatus(dbObject, message, description); } -ObjecttqStatus::~ObjecttqStatus() +ObjectStatus::~ObjectStatus() { delete msgHandler; } -const ObjecttqStatus& ObjecttqStatus::status() const +const ObjectStatus& ObjectStatus::status() const { return *this; } -bool ObjecttqStatus::error() const +bool ObjectStatus::error() const { return !message.isEmpty() || (dynamic_cast<KexiDB::Object*>((TQObject*)dbObj) && dynamic_cast<KexiDB::Object*>((TQObject*)dbObj)->error()); } -void ObjecttqStatus::settqStatus(const TQString& message, const TQString& description) +void ObjectStatus::setStatus(const TQString& message, const TQString& description) { this->dbObj=0; this->message=message; this->description=description; } -void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description) +void ObjectStatus::setStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description) { if (dynamic_cast<TQObject*>(dbObject)) { dbObj = dynamic_cast<TQObject*>(dbObject); @@ -221,7 +221,7 @@ void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, const TQString& messa this->description=description; } -void ObjecttqStatus::settqStatus(KexiDB::ResultInfo* result, const TQString& message, const TQString& description) +void ObjectStatus::setStatus(KexiDB::ResultInfo* result, const TQString& message, const TQString& description) { if (result) { if (message.isEmpty()) @@ -235,41 +235,41 @@ void ObjecttqStatus::settqStatus(KexiDB::ResultInfo* result, const TQString& mes this->description = description + " " + result->desc; } else - cleartqStatus(); + clearStatus(); } -void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, +void ObjectStatus::setStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, const TQString& message, const TQString& description) { if (!dbObject) - settqStatus(result, message, description); + setStatus(result, message, description); else if (!result) - settqStatus(dbObject, message, description); + setStatus(dbObject, message, description); else { - settqStatus(dbObject, message, description); - settqStatus(result, this->message, this->description); + setStatus(dbObject, message, description); + setStatus(result, this->message, this->description); } } -void ObjecttqStatus::cleartqStatus() +void ObjectStatus::clearStatus() { message=TQString(); description=TQString(); } -TQString ObjecttqStatus::singleStatusString() const { +TQString ObjectStatus::singleStatusString() const { if (message.isEmpty() || description.isEmpty()) return message; return message + " " + description; } -void ObjecttqStatus::append( const ObjecttqStatus& othertqStatus ) { +void ObjectStatus::append( const ObjectStatus& otherStatus ) { if (message.isEmpty()) { - message = othertqStatus.message; - description = othertqStatus.description; + message = otherStatus.message; + description = otherStatus.description; return; } - const TQString s( othertqStatus.singleStatusString() ); + const TQString s( otherStatus.singleStatusString() ); if (s.isEmpty()) return; if (description.isEmpty()) { @@ -283,7 +283,7 @@ void ObjecttqStatus::append( const ObjecttqStatus& othertqStatus ) { class ObjectStatusMessageHandler : public KexiDB::MessageHandler { public: - ObjectStatusMessageHandler(ObjecttqStatus *status) + ObjectStatusMessageHandler(ObjectStatus *status) : KexiDB::MessageHandler() , m_status(status) { @@ -295,18 +295,18 @@ class ObjectStatusMessageHandler : public KexiDB::MessageHandler virtual void showErrorMessage(const TQString &title, const TQString &details = TQString()) { - m_status->settqStatus(title, details); + m_status->setStatus(title, details); } virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString()) { - m_status->settqStatus(obj, msg); + m_status->setStatus(obj, msg); } - ObjecttqStatus *m_status; + ObjectStatus *m_status; }; -ObjecttqStatus::operator KexiDB::MessageHandler*() +ObjectStatus::operator KexiDB::MessageHandler*() { if (!msgHandler) msgHandler = new ObjectStatusMessageHandler(this); diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h index 426854e64..5a6804a53 100644 --- a/kexi/core/kexi.h +++ b/kexi/core/kexi.h @@ -87,43 +87,43 @@ namespace Kexi KEXICORE_EXPORT TQFont smallFont(TQWidget *init = 0); /*! Helper class for storing object status. */ - class KEXICORE_EXPORT ObjecttqStatus + class KEXICORE_EXPORT ObjectStatus { public: - ObjecttqStatus(); + ObjectStatus(); - ObjecttqStatus(const TQString& message, const TQString& description); + ObjectStatus(const TQString& message, const TQString& description); - ObjecttqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description); + ObjectStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description); - ~ObjecttqStatus(); + ~ObjectStatus(); - const ObjecttqStatus& status() const; + const ObjectStatus& status() const; bool error() const; - void settqStatus(const TQString& message, const TQString& description); + void setStatus(const TQString& message, const TQString& description); //! Note: for safety, \a dbObject needs to be derived from TQObject, //! otherwise it won't be assigned - void settqStatus(KexiDB::Object* dbObject, + void setStatus(KexiDB::Object* dbObject, const TQString& message = TQString(), const TQString& description = TQString()); - void settqStatus(KexiDB::ResultInfo* result, + void setStatus(KexiDB::ResultInfo* result, const TQString& message = TQString(), const TQString& description = TQString()); - void settqStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, + void setStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, const TQString& message = TQString(), const TQString& description = TQString()); - void cleartqStatus(); + void clearStatus(); TQString singleStatusString() const; - void append( const ObjecttqStatus& othertqStatus ); + void append( const ObjectStatus& otherStatus ); KexiDB::Object *dbObject() const { return dynamic_cast<KexiDB::Object*>((TQObject*)dbObj); } - //! Helper returning pseudo handler that just updates this ObjecttqStatus object + //! Helper returning pseudo handler that just updates this ObjectStatus object //! by receiving a message operator KexiDB::MessageHandler*(); diff --git a/kexi/core/kexiblobbuffer.cpp b/kexi/core/kexiblobbuffer.cpp index a4c57791c..aeb621c41 100644 --- a/kexi/core/kexiblobbuffer.cpp +++ b/kexi/core/kexiblobbuffer.cpp @@ -289,7 +289,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored) KexiDB::RowData rowData; tristate res = d->conn->querySingleRecord( schema, -// TQString::tqfromLatin1("SELECT o_data, o_name, o_caption, o_mime FROM kexi__blobs where o_id=") +// TQString::fromLatin1("SELECT o_data, o_name, o_caption, o_mime FROM kexi__blobs where o_id=") // +TQString::number(id), rowData); if (res!=true || rowData.size()<4) { diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp index ff642741a..14651f3f0 100644 --- a/kexi/core/kexidialogbase.cpp +++ b/kexi/core/kexidialogbase.cpp @@ -117,20 +117,20 @@ void KexiDialogBase::removeView(int mode) m_openedViewModes ^= mode; } -TQSize KexiDialogBase::tqminimumSizeHint() const +TQSize KexiDialogBase::minimumSizeHint() const { KexiViewBase *v = selectedView(); if (!v) - return KMdiChildView::tqminimumSizeHint(); - return v->tqminimumSizeHint() + TQSize(0, mdiParent() ? mdiParent()->captionHeight() : 0); + return KMdiChildView::minimumSizeHint(); + return v->minimumSizeHint() + TQSize(0, mdiParent() ? mdiParent()->captionHeight() : 0); } -TQSize KexiDialogBase::tqsizeHint() const +TQSize KexiDialogBase::sizeHint() const { KexiViewBase *v = selectedView(); if (!v) - return KMdiChildView::tqsizeHint(); - return v->preferredSizeHint( v->tqsizeHint() ); + return KMdiChildView::sizeHint(); + return v->preferredSizeHint( v->sizeHint() ); } /* @@ -377,8 +377,8 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr delete newView; kdDebug() << "Switching to mode " << newViewMode << " failed. Previous mode " << prevViewMode << " restored." << endl; - const Kexi::ObjecttqStatus status(*this); - settqStatus(mainWin()->project()->dbConnection(), + const Kexi::ObjectStatus status(*this); + setStatus(mainWin()->project()->dbConnection(), i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(newViewMode)),""); append( status ); m_currentViewMode = prevViewMode; @@ -517,7 +517,7 @@ tristate KexiDialogBase::storeNewData() if (cancel) return cancelled; if (!m_schemaData) { - settqStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's definition failed."),""); + setStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's definition failed."),""); return false; } @@ -594,7 +594,7 @@ tristate KexiDialogBase::storeData(bool dontAsk) return false; #define storeData_ERR \ - settqStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's data failed."),""); + setStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's data failed."),""); //save changes using transaction KexiDB::Transaction transaction = m_parentWindow->project()->dbConnection()->beginTransaction(); @@ -624,8 +624,8 @@ tristate KexiDialogBase::storeData(bool dontAsk) void KexiDialogBase::activate() { KexiViewBase *v = selectedView(); - //kdDebug() << "tqfocusWidget(): " << tqfocusWidget()->name() << endl; - if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//tqfocusWidget())) + //kdDebug() << "focusWidget(): " << focusWidget()->name() << endl; + if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//focusWidget())) KMdiChildView::activate(); else {//ah, focused widget is not in this view, move focus: if (v) diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h index 6449004b8..d98e9d04f 100644 --- a/kexi/core/kexidialogbase.h +++ b/kexi/core/kexidialogbase.h @@ -75,7 +75,7 @@ class KEXICORE_EXPORT KexiDialogTempData : public TQObject class KEXICORE_EXPORT KexiDialogBase : public KMdiChildView, public KexiActionProxy, - public Kexi::ObjecttqStatus + public Kexi::ObjectStatus { Q_OBJECT TQ_OBJECT @@ -101,10 +101,10 @@ class KEXICORE_EXPORT KexiDialogBase : // virtual TQWidget* mainWidget() = 0; /*! reimplemented: minimum size hint is inherited from currently visible view. */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /*! reimplemented: size hint is inherited from currently visible view. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; KexiMainWindow *mainWin() const { return m_parentWindow; } diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp index 4121543e4..5b2b2791b 100644 --- a/kexi/core/kexiguimsghandler.cpp +++ b/kexi/core/kexiguimsghandler.cpp @@ -77,13 +77,13 @@ void KexiGUIMessageHandler::showErrorMessage(const TQString &msg, const TQString } void -KexiGUIMessageHandler::showErrorMessage(Kexi::ObjecttqStatus *status) +KexiGUIMessageHandler::showErrorMessage(Kexi::ObjectStatus *status) { showErrorMessage("", status); } void -KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjecttqStatus *status) +KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjectStatus *status) { if (status && status->error()) { TQString msg(message); @@ -106,7 +106,7 @@ KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjecttqS else { showErrorMessage(message); } - status->cleartqStatus(); + status->clearStatus(); } void diff --git a/kexi/core/kexiguimsghandler.h b/kexi/core/kexiguimsghandler.h index af407ab16..362884dcf 100644 --- a/kexi/core/kexiguimsghandler.h +++ b/kexi/core/kexiguimsghandler.h @@ -32,8 +32,8 @@ class KEXICORE_EXPORT KexiGUIMessageHandler : public KexiDB::MessageHandler virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString()); void showErrorMessage(const TQString&,const TQString&,KexiDB::Object *obj); - void showErrorMessage(Kexi::ObjecttqStatus *status); - void showErrorMessage(const TQString &message, Kexi::ObjecttqStatus *status); + void showErrorMessage(Kexi::ObjectStatus *status); + void showErrorMessage(const TQString &message, Kexi::ObjectStatus *status); /*! Displays a "Sorry" message with \a title text and optional \a details. */ void showSorryMessage(const TQString &title, const TQString &details = TQString()); diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp index 93d73cacc..669039cc7 100644 --- a/kexi/core/kexiinternalpart.cpp +++ b/kexi/core/kexiinternalpart.cpp @@ -118,8 +118,8 @@ KexiDialogBase* KexiInternalPart::findOrCreateKexiDialog( dlg->addView(view); dlg->setCaption( view->caption() ); dlg->setTabCaption( view->caption() ); - dlg->resize(view->tqsizeHint()); - dlg->setMinimumSize(view->tqminimumSizeHint().width(),view->tqminimumSizeHint().height()); + dlg->resize(view->sizeHint()); + dlg->setMinimumSize(view->minimumSizeHint().width(),view->minimumSizeHint().height()); dlg->setId( mainWin->generatePrivateID() ); dlg->registerDialog(); return dlg; diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp index ba54fea71..6671e1689 100644 --- a/kexi/core/kexipart.cpp +++ b/kexi/core/kexipart.cpp @@ -242,7 +242,7 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in d->instanceActionsInitialized = true; } - m_status.cleartqStatus(); + m_status.clearStatus(); // KexiDialogBase *dlg = createInstance(win,item,viewMode); // if (!dlg) // return 0; @@ -289,10 +289,10 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in } if (!dlg->m_schemaData) { if (!m_status.error()) - m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(), + m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(), i18n("Could not load object's definition."), i18n("Object design may be corrupted.")); m_status.append( - Kexi::ObjecttqStatus(i18n("You can delete \"%1\" object and create it again.") + Kexi::ObjectStatus(i18n("You can delete \"%1\" object and create it again.") .tqarg(item.name()), TQString()) ); dlg->close(); @@ -339,9 +339,9 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in dlg->show(); if (dlg->mdiParent() && dlg->mdiParent()->state()==KMdiChildFrm::Normal) //only resize dialog if it is in normal state - dlg->resize(dlg->tqsizeHint()); + dlg->resize(dlg->sizeHint()); - dlg->setMinimumSize(dlg->tqminimumSizeHint().width(),dlg->tqminimumSizeHint().height()); + dlg->setMinimumSize(dlg->minimumSizeHint().width(),dlg->minimumSizeHint().height()); //dirty only if it's a new object if (dlg->selectedView()) @@ -366,7 +366,7 @@ KexiDB::SchemaData* Part::loadSchemaData(KexiDialogBase * /*dlg*/, const KexiDB: bool Part::loadDataBlock( KexiDialogBase *dlg, TQString &dataString, const TQString& dataID) { if (!dlg->mainWin()->project()->dbConnection()->loadDataBlock( dlg->id(), dataString, dataID )) { - m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(), + m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(), i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").tqarg(dataID) ); m_status.append( *dlg ); return false; @@ -435,7 +435,7 @@ GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, c , KXMLGUIClient(win) { if(!win->project()->data()->userMode()) - setXMLFile(TQString::tqfromLatin1("kexi")+part->info()->objectName() + setXMLFile(TQString::fromLatin1("kexi")+part->info()->objectName() +"part"+(partInstanceClient?"inst":"")+"ui.rc"); // new KAction(part->m_names["new"], part->info()->itemIcon(), 0, this, diff --git a/kexi/core/kexipart.h b/kexi/core/kexipart.h index f1168fd46..c448b8bf9 100644 --- a/kexi/core/kexipart.h +++ b/kexi/core/kexipart.h @@ -186,7 +186,7 @@ class KEXICORE_EXPORT Part : public TQObject /*! \return action collection for mode \a viewMode. */ KActionCollection* actionCollectionForMode(int viewMode) const; - const Kexi::ObjecttqStatus& lastOperationtqStatus() const { return m_status; } + const Kexi::ObjectStatus& lastOperationStatus() const { return m_status; } /*! \return i18n'd message translated from \a englishMessage. This method is useful for messages like: @@ -309,7 +309,7 @@ class KEXICORE_EXPORT Part : public TQObject GUIClient *m_guiClient; TQIntDict<GUIClient> m_instanceGuiClients; KexiMainWindow* m_mainWin; - Kexi::ObjecttqStatus m_status; + Kexi::ObjectStatus m_status; /*! If you're implementing a new part, set this to value >0 in your ctor if you have well known (ie registered ID) for your part. diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp index 159de7506..5b26cb39e 100644 --- a/kexi/core/kexiproject.cpp +++ b/kexi/core/kexiproject.cpp @@ -381,10 +381,10 @@ bool KexiProject::createInternalStructures(bool insideTransaction) } // 2.1 copy data (insert 0's into o_folder_id column) if (!d->connection->executeSQL( - TQString::tqfromLatin1("INSERT INTO kexi__blobs (o_data, o_name, o_caption, o_mime, o_folder_id) " + TQString::fromLatin1("INSERT INTO kexi__blobs (o_data, o_name, o_caption, o_mime, o_folder_id) " "SELECT o_data, o_name, o_caption, o_mime, 0 FROM kexi__blobs") ) // 2.2 remove the original kexi__blobs - || !d->connection->executeSQL(TQString::tqfromLatin1("DROP TABLE kexi__blobs")) //lowlevel + || !d->connection->executeSQL(TQString::fromLatin1("DROP TABLE kexi__blobs")) //lowlevel // 2.3 rename the copy back into kexi__blobs || !d->connection->drv_alterTableName(*kexi__blobsCopy, "kexi__blobs") ) @@ -735,10 +735,10 @@ KexiDialogBase* KexiProject::openObject(KexiMainWindow *wnd, KexiPart::Item& ite return 0; KexiDialogBase *dlg = part->openInstance(wnd, item, viewMode, staticObjectArgs); if (!dlg) { - if (part->lastOperationtqStatus().error()) + if (part->lastOperationStatus().error()) setError(i18n("Opening object \"%1\" failed.").tqarg(item.name())+"<br>" - +part->lastOperationtqStatus().message, - part->lastOperationtqStatus().description); + +part->lastOperationStatus().message, + part->lastOperationStatus().description); return 0; } return dlg; @@ -835,7 +835,7 @@ bool KexiProject::renameObject( KexiMainWindow *wnd, KexiPart::Item& item, const return false; } if (!part->rename(wnd, item, newName)) { - setError(part->lastOperationtqStatus().message, part->lastOperationtqStatus().description); + setError(part->lastOperationStatus().message, part->lastOperationStatus().description); return false; } if (!d->connection->executeSQL( "update kexi__objects set o_name=" diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index 6a696461f..04197412f 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -42,7 +42,7 @@ KexiSharedActionHostPrivate::KexiSharedActionHostPrivate(KexiSharedActionHost *h void KexiSharedActionHostPrivate::slotAction(const TQString& act_id) { - TQWidget *w = host->focusWindow(); //tqfocusWidget(); + TQWidget *w = host->focusWindow(); //focusWidget(); // while (w && !w->inherits("KexiDialogBase") && !w->inherits("KexiDockBase")) // w = w->parentWidget(); @@ -111,7 +111,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a }*/ if (!d) return; //sanity - TQWidget *fw = d->mainWin->tqfocusWidget(); + TQWidget *fw = d->mainWin->focusWidget(); while (fw && TQT_BASE_OBJECT(obj)!=TQT_BASE_OBJECT(fw)) fw = fw->parentWidget(); if (!fw) @@ -205,7 +205,7 @@ TQWidget* KexiSharedActionHost::focusWindow() TQWidget *aw = TQT_TQWIDGET(tqApp->activeWindow()); if (!aw) aw = d->mainWin; - fw = aw->tqfocusWidget(); + fw = aw->focusWidget(); } while (fw && !acceptsSharedActions(TQT_TQOBJECT(fw))) fw = fw->parentWidget(); diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h index 91cc09f4e..c7fcb1814 100644 --- a/kexi/core/kexisharedactionhost.h +++ b/kexi/core/kexisharedactionhost.h @@ -69,7 +69,7 @@ class KEXICORE_EXPORT KexiSharedActionHost */ virtual bool acceptsSharedActions(TQObject *o); - /*! \return window widget that is currently focused (using TQWidget::tqfocusWidget()) + /*! \return window widget that is currently focused (using TQWidget::focusWidget()) and matches acceptsSharedActions(). If focused widget does not match, it's parent, grandparent, and so on is checked. If all this fails, or no widget has focus, NULL is returned. diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp index e89f4a4ea..45df1b0d1 100644 --- a/kexi/core/kexiviewbase.cpp +++ b/kexi/core/kexiviewbase.cpp @@ -214,26 +214,26 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e ) { if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) { // //hp==true if currently focused widget is a child of this table view -// const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), tqfocusWidget()); +// const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), focusWidget()); // kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl; if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(o))) { - if (e->type()==TQEvent::FocusOut && tqfocusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) { + if (e->type()==TQEvent::FocusOut && focusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) { //focus out: when currently focused widget is not a parent of this view emit focus(false); } else if (e->type()==TQEvent::FocusIn) { emit focus(true); } - if (e->type()==TQEvent::FocusOut) { // && tqfocusWidget() && Kexi::hasParent( this, tqfocusWidget())) { // && tqfocusWidget()->inherits("KexiViewBase")) { -// kdDebug() << tqfocusWidget()->className() << " " << tqfocusWidget()->name()<< endl; + if (e->type()==TQEvent::FocusOut) { // && focusWidget() && Kexi::hasParent( this, focusWidget())) { // && focusWidget()->inherits("KexiViewBase")) { +// kdDebug() << focusWidget()->className() << " " << focusWidget()->name()<< endl; // kdDebug() << o->className() << " " << o->name()<< endl; KexiViewBase *v = KexiUtils::findParent<KexiViewBase>(o, "KexiViewBase") ; -// TQWidget *www=v->tqfocusWidget(); +// TQWidget *www=v->focusWidget(); if (v) { while (v->m_parentView) v = v->m_parentView; - if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->tqfocusWidget()) )) - v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->tqfocusWidget()); -// v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //tqfocusWidget(); + if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->focusWidget()) )) + v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->focusWidget()); +// v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //focusWidget(); } } diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h index 139f0b2d0..1b2b6f38a 100644 --- a/kexi/core/kexiviewbase.h +++ b/kexi/core/kexiviewbase.h @@ -71,7 +71,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy /*! \return preferred size hint, that can be used to resize the view. It is computed using maximum of (a) \a otherSize and (b) current KMDI dock area's size, - so the view won't exceed this maximum size. The method is used e.g. in KexiDialogBase::tqsizeHint(). + so the view won't exceed this maximum size. The method is used e.g. in KexiDialogBase::sizeHint(). If you reimplement this method, do not forget to return value of yoursize.boundedTo( KexiViewBase::preferredSizeHint(otherSize) ). */ virtual TQSize preferredSizeHint(const TQSize& otherSize); diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index c9bad809b..241a1291b 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -127,7 +127,7 @@ PropertyCommand::unexecute() WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widg); TQWidget *subWidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widg; - if (-1!=subWidget->tqmetaObject()->findProperty( m_property, true )) + if (-1!=subWidget->metaObject()->findProperty( m_property, true )) subWidget->setProperty(m_property, it.data()); } @@ -438,7 +438,7 @@ AdjustSizeCommand::execute() if(item && !item->tqchildren()->isEmpty()) { // container TQSize s; if(item->container() && item->container()->tqlayout()) - s = w->tqsizeHint(); + s = w->sizeHint(); else s = getSizeFromChildren(item); // minimum size for containers @@ -457,9 +457,9 @@ AdjustSizeCommand::execute() else if(item && item->container()) // empty container w->resize(item->container()->form()->gridSize() * 5, item->container()->form()->gridSize() * 5); // basic size else { - TQSize tqsizeHint(w->tqsizeHint()); - if (tqsizeHint.isValid()) - w->resize(tqsizeHint); + TQSize sizeHint(w->sizeHint()); + if (sizeHint.isValid()) + w->resize(sizeHint); } } break; @@ -755,7 +755,7 @@ InsertWidgetCommand::execute() // if the insertRect is invalid (ie only one point), we use widget' size hint if(( (m_insertRect.width() < 21) && (m_insertRect.height() < 21))) { - TQSize s = w->tqsizeHint(); + TQSize s = w->sizeHint(); if(s.isEmpty()) s = TQSize(20, 20); // Minimum size to avoid creating a (0,0) widget @@ -912,7 +912,7 @@ CreateLayoutCommand::execute() container->setSelectedWidget(0, false); w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget - // tqsizeHint of these widgets depends on tqgeometry, so give them appropriate tqgeometry + // sizeHint of these widgets depends on tqgeometry, so give them appropriate tqgeometry if(m_type == Container::HFlow) w->resize( TQSize(700, 20) ); else if(m_type == Container::VFlow) @@ -938,7 +938,7 @@ CreateLayoutCommand::execute() ((TQSplitter*)w)->setOrientation(Qt::Vertical); else if(tree->container()) { tree->container()->setLayout((Container::LayoutType)m_type); - w->resize(tree->container()->tqlayout()->tqsizeHint()); // the tqlayout doesn't have its own size + w->resize(tree->container()->tqlayout()->sizeHint()); // the tqlayout doesn't have its own size } container->setSelectedWidget(w, false); @@ -1249,13 +1249,13 @@ PasteWidgetCommand::fixPos(TQDomElement &el, Container *container) int rh = h.text().toInt(); TQRect r(rx, ry, rw, rh); - TQWidget *w = m_form->widget()->tqchildAt(r.x() + 6, r.y() + 6, false); + TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false); if(!w) return; while((w->tqgeometry() == r) && (w != 0))// there is already a widget there, with the same size { - w = m_form->widget()->tqchildAt(w->x() + 16, w->y() + 16, false); + w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false); r.moveBy(10,10); } @@ -1300,11 +1300,11 @@ PasteWidgetCommand::moveWidgetBy(TQDomElement &el, Container *container, const T TQRect r(rx + p.x(), ry + p.y(), rw, rh); kdDebug() << "Moving widget by " << p << " from " << rx << " " << ry << " to " << r.topLeft() << endl; - TQWidget *w = m_form->widget()->tqchildAt(r.x() + 6, r.y() + 6, false); + TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false); while(w && (w->tqgeometry() == r))// there is already a widget there, with the same size { - w = m_form->widget()->tqchildAt(w->x() + 16, w->y() + 16, false); + w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false); r.moveBy(10,10); } diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp index f683ce744..38b6e08e9 100644 --- a/kexi/formeditor/connectiondialog.cpp +++ b/kexi/formeditor/connectiondialog.cpp @@ -60,10 +60,10 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) m_pixmapLabel = new TQLabel(details); m_pixmapLabel->setFixedWidth( int(IconSize(KIcon::Desktop) * 1.5) ); - m_pixmapLabel->tqsetAlignment(AlignHCenter | AlignTop); + m_pixmapLabel->setAlignment(AlignHCenter | AlignTop); m_textLabel = new TQLabel(details); - m_textLabel->tqsetAlignment(AlignLeft | AlignTop); + m_textLabel->setAlignment(AlignLeft | AlignTop); //setStatusOk(); // And the KexiTableView //////// @@ -289,7 +289,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item) TQString signalArg(signal); signalArg = signalArg.remove( TQRegExp(".*[(]|[)]") ); - TQStrList slotList = tree->widget()->tqmetaObject()->slotNames(true); + TQStrList slotList = tree->widget()->metaObject()->slotNames(true); TQStrListIterator it(slotList); for(; it.current() != 0; ++it) { @@ -297,7 +297,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item) TQString slotArg(*it); slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") ); - if(!signalArg.tqstartsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible + if(!signalArg.startsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible continue; KexiTableItem *item = m_slotsColumnData->createItem(); //new KexiTableItem(2); @@ -315,7 +315,7 @@ ConnectionDialog::updateSignalList(KexiTableItem *item) return; m_signalsColumnData->deleteAllRows(); - TQStrList signalList = tree->widget()->tqmetaObject()->signalNames(true); + TQStrList signalList = tree->widget()->metaObject()->signalNames(true); TQStrListIterator it(signalList); for(; it.current() != 0; ++it) { @@ -346,7 +346,7 @@ ConnectionDialog::checkConnection(KexiTableItem *item) TQString slot = (*item)[4].toString(); slot = slot.remove( TQRegExp(".*[(]|[)]") ); - if(!signal.tqstartsWith(slot, true)) + if(!signal.startsWith(slot, true)) { setStatusError( i18n("The signal/slot arguments are not compatible."), item); return; diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index acc72c240..2e30d5f40 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -73,7 +73,7 @@ ContainerWidget::~ContainerWidget() { } -TQSize ContainerWidget::tqsizeHint() const +TQSize ContainerWidget::sizeHint() const { return TQSize(30,30); //default } @@ -125,7 +125,7 @@ KFDTabWidget::~KFDTabWidget() } TQSize -KFDTabWidget::tqsizeHint() const +KFDTabWidget::sizeHint() const { TQSize s(30,30); // default min size for(int i=0; i < count(); i++) @@ -218,10 +218,10 @@ VFlow::paintEvent(TQPaintEvent *) } TQSize -VFlow::tqsizeHint() const +VFlow::sizeHint() const { if(tqlayout()) - return tqlayout()->tqsizeHint(); + return tqlayout()->sizeHint(); else return TQSize(700, 50); // default } @@ -318,7 +318,7 @@ SubForm::SubForm(TQWidget *parent, const char *name) : TQScrollView(parent, name), m_form(0), m_widget(0) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); - viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); + viewport()->setPaletteBackgroundColor(colorGroup().mid()); } void @@ -860,7 +860,7 @@ void ContainerFactory::renameTabPage() #if TDE_VERSION < KDE_MAKE_VERSION(3,1,9) TQLineEdit::Normal, #endif - tab->tabLabel(w), &ok, w->tqtopLevelWidget()); + tab->tabLabel(w), &ok, w->topLevelWidget()); if(ok) tab->changeTab(w, name); } diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h index b88b437f8..6f013e9cd 100644 --- a/kexi/formeditor/factories/containerfactory.h +++ b/kexi/formeditor/factories/containerfactory.h @@ -126,7 +126,7 @@ class KFORMEDITOR_EXPORT VFlow : public TQFrame virtual ~VFlow(){;} void setPreviewMode() {m_preview = true;} virtual void paintEvent(TQPaintEvent *ev); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: bool m_preview; @@ -144,7 +144,7 @@ class KFORMEDITOR_EXPORT ContainerWidget : public TQWidget ContainerWidget(TQWidget *parent, const char *name); virtual ~ContainerWidget(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; //! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface virtual void dragMoveEvent( TQDragMoveEvent *e ); @@ -170,7 +170,7 @@ class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget KFDTabWidget(TQWidget *parent, const char *name); virtual ~KFDTabWidget(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; //! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface virtual void dragMoveEvent( TQDragMoveEvent *e ); diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 24827e131..afc370867 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -431,13 +431,13 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, w = new KProgress(p, n); else if(c == "KDateWidget") - w = new KDateWidget(TQDate::tqcurrentDate(), p, n); + w = new KDateWidget(TQDate::currentDate(), p, n); else if(c == "KTimeWidget") w = new KTimeWidget(TQTime::currentTime(), p, n); else if(c == "KDateTimeWidget") - w = new KDateTimeWidget(TQDateTime::tqcurrentDateTime(), p, n); + w = new KDateTimeWidget(TQDateTime::currentDateTime(), p, n); else if(c == "Line") w = new Line(options & WidgetFactory::VerticalOrientation ? Qt::Vertical : Qt::Horizontal, p, n); @@ -605,13 +605,13 @@ StdWidgetFactory::changeText(const TQString &text) else changeProperty("text", text, m_container->form()); - /* By-hand method not needed as tqsizeHint() can do that for us + /* By-hand method not needed as sizeHint() can do that for us TQFontMetrics fm = w->fontMetrics(); TQSize s(fm.width( text ), fm.height()); int width; if(n == TQLABEL_OBJECT_NAME_STRING) // labels are resized to fit the text { - w->resize(w->tqsizeHint()); + w->resize(w->sizeHint()); WidgetFactory::m_editor->resize(w->size()); return; } @@ -624,7 +624,7 @@ StdWidgetFactory::changeText(const TQString &text) width = w->style().sizeFromContents( TQStyle::CT_RadioButton, w, s).width(); else return; - int width = w->tqsizeHint().width();*/ + int width = w->sizeHint().width();*/ #if 0 //not needed here, size hint is used on creation in InsertWidgetCommand::execute() if(w->width() < width) @@ -956,7 +956,7 @@ StdWidgetFactory::editText() } if(classname == TQLABEL_OBJECT_NAME_STRING) - widget()->resize(widget()->tqsizeHint()); + widget()->resize(widget()->sizeHint()); } void diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index b5b209365..237c7ec83 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -364,10 +364,10 @@ Form::changeName(const TQCString &oldname, const TQCString &newname) return; if(!d->topTree->rename(oldname, newname)) // rename failed { - KMessageBox::sorry(widget()->tqtopLevelWidget(), + KMessageBox::sorry(widget()->topLevelWidget(), i18n("Renaming widget \"%1\" to \"%2\" failed.").tqarg(TQString(oldname)).tqarg(TQString(newname))); //moved to WidgetPropertySet::slotChangeProperty() -// KMessageBox::sorry(widget()->tqtopLevelWidget(), +// KMessageBox::sorry(widget()->topLevelWidget(), // i18n("A widget with this name already exists. " // "Please choose another name or rename existing widget.")); kdDebug() << "Form::changeName() : ERROR : A widget named " << newname << " already exists" << endl; diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 2759fe985..24347c40f 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -406,10 +406,10 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = w; bool addSubwidgetFlag = false; - int propertyId = w->tqmetaObject()->findProperty(name, true); + int propertyId = w->metaObject()->findProperty(name, true); if (propertyId == -1 && subpropIface && subpropIface->subwidget()) { // try property from subwidget subwidget = subpropIface->subwidget(); - propertyId = subpropIface->subwidget()->tqmetaObject()->findProperty(name, true); + propertyId = subpropIface->subwidget()->metaObject()->findProperty(name, true); addSubwidgetFlag = true; } if(propertyId == -1) @@ -420,7 +420,7 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const return; } - const TQMetaProperty *meta = subwidget->tqmetaObject()->property(propertyId, true); + const TQMetaProperty *meta = subwidget->metaObject()->property(propertyId, true); if (!meta->stored( subwidget )) //not storable return; TQDomElement propertyE = parent.createElement("property"); @@ -880,8 +880,8 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name) { WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(obj); TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? TQT_TQOBJECT(subpropIface->subwidget()) : obj; - const int count = subobject->tqmetaObject()->findProperty(name.latin1(), true); - const TQMetaProperty *meta = count!=-1 ? subobject->tqmetaObject()->property(count, true) : 0; + const int count = subobject->metaObject()->findProperty(name.latin1(), true); + const TQMetaProperty *meta = count!=-1 ? subobject->metaObject()->property(count, true) : 0; if (meta) { if (meta->isSetType()) { @@ -968,7 +968,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do // - needed when subproperties are defined after subwidget creation, and subwidget is created after setting "dataSource" // (this is the case for KexiDBAutoField) //! @todo more properties like "dataSource" may needed here... -// if (-1 != item->widget()->tqmetaObject()->findProperty("dataSource")) +// if (-1 != item->widget()->metaObject()->findProperty("dataSource")) // savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget()); // We don't want to save the tqgeometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example) @@ -1261,7 +1261,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren = dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w; for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it) { - if(subwidget->tqmetaObject()->findProperty(*it, true) != -1) + if(subwidget->metaObject()->findProperty(*it, true) != -1) item->addModifiedProperty(*it, subwidget->property(*it)); } @@ -1376,9 +1376,9 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl } } // If the object doesn't have this property, we let the Factory handle it (maybe a special property) - else if(subwidget->tqmetaObject()->findProperty(name.latin1(), true) == -1) + else if(subwidget->metaObject()->findProperty(name.latin1(), true) == -1) { - if(w->className() == TQString::tqfromLatin1("CustomWidget")) + if(w->className() == TQString::fromLatin1("CustomWidget")) item->storeUnknownProperty(node); else { bool read = container->form()->library()->readSpecialProperty( @@ -1400,8 +1400,8 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl val = r; } subwidget->setProperty(name.latin1(), val); -// int count = w->tqmetaObject()->findProperty(name, true); -// const TQMetaProperty *meta = w->tqmetaObject()->property(count, true); +// int count = w->metaObject()->findProperty(name, true); +// const TQMetaProperty *meta = w->metaObject()->property(count, true); // if(meta && meta->isEnumType()) { // val = w->property(name.latin1()); //update: we want a numeric value of enum // } @@ -1460,7 +1460,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl readChildNodes(item, container, node, w); } else {// unknown tag, we let the Factory handle it - if(w->className() == TQString::tqfromLatin1("CustomWidget")) + if(w->className() == TQString::fromLatin1("CustomWidget")) item->storeUnknownProperty(node); else { bool read = container->form()->library()->readSpecialProperty( diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index a2ed0dac0..5fb76ca89 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX m_style->setEditable(false); KGlobal::config()->setGroup("General"); - TQString currentStyle = TQString::tqfromLatin1(kapp->tqstyle().name()).lower(); + TQString currentStyle = TQString::fromLatin1(kapp->tqstyle().name()).lower(); const TQStringList styles = TQStyleFactory::keys(); m_style->setItems(styles); m_style->setCurrentItem(0); @@ -790,7 +790,7 @@ FormManager::createSignalMenu(TQWidget *w) m_sigSlotMenu = new KPopupMenu(); m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Signals")); - TQStrList list = w->tqmetaObject()->signalNames(true); + TQStrList list = w->metaObject()->signalNames(true); TQStrListIterator it(list); for(; it.current() != 0; ++it) m_sigSlotMenu->insertItem(*it); @@ -813,14 +813,14 @@ FormManager::createSlotMenu(TQWidget *w) TQString signalArg( m_connection->signal().remove( TQRegExp(".*[(]|[)]") ) ); - TQStrList list = w->tqmetaObject()->slotNames(true); + TQStrList list = w->metaObject()->slotNames(true); TQStrListIterator it(list); for(; it.current() != 0; ++it) { // we add the slot only if it is compatible with the signal TQString slotArg(*it); slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") ); - if(!signalArg.tqstartsWith(slotArg, true)) // args not compatible + if(!signalArg.startsWith(slotArg, true)) // args not compatible continue; m_sigSlotMenu->insertItem(*it); @@ -937,7 +937,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu // We create the signals menu KPopupMenu *sigMenu = new KPopupMenu(); - TQStrList list = w->tqmetaObject()->signalNames(true); + TQStrList list = w->metaObject()->signalNames(true); TQStrListIterator it(list); for(; it.current() != 0; ++it) sigMenu->insertItem(*it); @@ -1115,7 +1115,7 @@ FormManager::createLayout(int layoutType) kdDebug() << "comparing widget " << w->name() << " whose parent is " << w->parentWidget()->name() << " insteaed of " << parent->name() << endl; if(w->parentWidget() != parent) { - KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n" + KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n" "All selected widgets must have the same parent.")); kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl; return; @@ -1188,7 +1188,7 @@ FormManager::editTabOrder() { if(!activeForm() || !activeForm()->objectTree()) return; - TQWidget *topLevel = m_active->widget()->tqtopLevelWidget(); + TQWidget *topLevel = m_active->widget()->topLevelWidget(); TabStopDialog dlg(topLevel); //const bool oldAutoTabStops = m_active->autoTabStops(); if (dlg.exec(m_active) == TQDialog::Accepted) { @@ -1222,7 +1222,7 @@ FormManager::editFormPixmapCollection() if(!activeForm() || !activeForm()->objectTree()) return; - PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->tqtopLevelWidget()); + PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->topLevelWidget()); dialog.exec(); } @@ -1234,7 +1234,7 @@ FormManager::editConnections() if(!activeForm() || !activeForm()->objectTree()) return; - ConnectionDialog dialog(activeForm()->widget()->tqtopLevelWidget()); + ConnectionDialog dialog(activeForm()->widget()->topLevelWidget()); dialog.exec(activeForm()); } @@ -1493,7 +1493,7 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple ) WidgetList *wlist = form->selectedWidgets(); bool fontEnabled = false; for (WidgetListIterator it(*wlist); it.current(); ++it) { - if (-1 != it.current()->tqmetaObject()->findProperty("font", true)) { + if (-1 != it.current()->metaObject()->findProperty("font", true)) { fontEnabled = true; break; } diff --git a/kexi/formeditor/kfdpixmapedit.cpp b/kexi/formeditor/kfdpixmapedit.cpp index db9a726e6..64e65f1ec 100644 --- a/kexi/formeditor/kfdpixmapedit.cpp +++ b/kexi/formeditor/kfdpixmapedit.cpp @@ -48,7 +48,7 @@ KFDPixmapEdit::selectPixmap() ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name()); TQString name = item ? item->pixmapName(property()->name()) : ""; - PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() ); + PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() ); if(dialog.exec() == TQDialog::Accepted) { setValue(dialog.pixmap(), true); item->setPixmapName(property()->name(), dialog.pixmapName()); diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp index 049df3a56..ba48214bf 100644 --- a/kexi/formeditor/objecttreeview.cpp +++ b/kexi/formeditor/objecttreeview.cpp @@ -191,10 +191,10 @@ ObjectTreeView::~ObjectTreeView() } TQSize -ObjectTreeView::tqsizeHint() const +ObjectTreeView::sizeHint() const { return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+" "), - KListView::tqsizeHint().height()); + KListView::sizeHint().height()); } TQString diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h index b625c0ad2..2ddf867c4 100644 --- a/kexi/formeditor/objecttreeview.h +++ b/kexi/formeditor/objecttreeview.h @@ -73,7 +73,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView ObjectTreeView(TQWidget *parent=0, const char *name=0, bool tabStop = false); virtual ~ObjectTreeView(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /*! Sets \a form as the current Form in the list. The list will automatically be filled with an item for each widget in the Form, and selection will be synced. diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp index 168102b02..e3b73975d 100644 --- a/kexi/formeditor/richtextdialog.cpp +++ b/kexi/formeditor/richtextdialog.cpp @@ -146,10 +146,10 @@ RichTextDialog::buttonToggled(int id) if(!isOn) break; switch(id) { - case TBLeft: m_edit->tqsetAlignment(TQt::AlignLeft); break; - case TBCenter: m_edit->tqsetAlignment(TQt::AlignCenter); break; - case TBRight: m_edit->tqsetAlignment(TQt::AlignRight); break; - case TBJustify: m_edit->tqsetAlignment(TQt::AlignJustify); break; + case TBLeft: m_edit->setAlignment(TQt::AlignLeft); break; + case TBCenter: m_edit->setAlignment(TQt::AlignCenter); break; + case TBRight: m_edit->setAlignment(TQt::AlignRight); break; + case TBJustify: m_edit->setAlignment(TQt::AlignJustify); break; default: break; } } diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp index 1ec9a2b4f..074b8810f 100644 --- a/kexi/formeditor/spring.cpp +++ b/kexi/formeditor/spring.cpp @@ -54,18 +54,18 @@ Spring::SizeType Spring::sizeType() const { if(m_orient ==Qt::Vertical) - return (SizeType)tqsizePolicy().verData(); + return (SizeType)sizePolicy().verData(); else - return (SizeType)tqsizePolicy().horData(); + return (SizeType)sizePolicy().horData(); } void Spring::setSizeType(SizeType size) { if(m_orient ==Qt::Vertical) - tqsetSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size); + setSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size); else - tqsetSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum); + setSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum); } void @@ -144,10 +144,10 @@ Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parentNode if(parentNode.tagName() == "widget") KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget()); - if(!item->widget()->tqsizeHint().isValid()) - KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "tqsizeHint", item->widget()->property("size"), item->widget()); + if(!item->widget()->sizeHint().isValid()) + KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeHint", item->widget()->property("size"), item->widget()); else - KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "tqsizeHint", item->widget()->property("tqsizeHint"), item->widget()); + KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeHint", item->widget()->property("sizeHint"), item->widget()); KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "orientation", item->widget()->property("orientation"), item->widget()); KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeType", item->widget()->property("sizeType"), item->widget()); diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index 0cfe04833..09549ddc4 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -276,7 +276,7 @@ void KFormDesignerKDevPart::open() { m_openingFile = true; - KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->tqtopLevelWidget()); + KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->topLevelWidget()); if(!url.isEmpty()) ReadWritePart::openURL(url); m_openingFile = false; @@ -321,7 +321,7 @@ KFormDesignerKDevPart::saveAs() bool KFormDesignerKDevPart::closeForm(Form *form) { - int res = KMessageBox::warningYesNoCancel( m_workspace->tqtopLevelWidget(), + int res = KMessageBox::warningYesNoCancel( m_workspace->topLevelWidget(), i18n( "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ), i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() ); diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index cd51817a7..386bdabfc 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -296,7 +296,7 @@ void KFormDesignerPart::open() { m_openingFile = true; - KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->tqtopLevelWidget()); + KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->topLevelWidget()); if(!url.isEmpty()) ReadWritePart::openURL(url); m_openingFile = false; @@ -332,7 +332,7 @@ void KFormDesignerPart::saveAs() { KURL url = KFileDialog::getSaveURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), - m_workspace->tqtopLevelWidget()); + m_workspace->topLevelWidget()); if(url.isEmpty()) return; else @@ -342,7 +342,7 @@ KFormDesignerPart::saveAs() bool KFormDesignerPart::closeForm(Form *form) { - int res = KMessageBox::questionYesNoCancel( m_workspace->tqtopLevelWidget(), + int res = KMessageBox::questionYesNoCancel( m_workspace->topLevelWidget(), i18n( "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ), i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() ); diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp index 6ce4bcaef..85e932045 100644 --- a/kexi/formeditor/utils.cpp +++ b/kexi/formeditor/utils.cpp @@ -119,9 +119,9 @@ KFormDesigner::getSizeFromChildren(TQWidget *w, const char *inheritClass) // ----------------- -HorWidgetList::HorWidgetList(TQWidget *tqtopLevelWidget) +HorWidgetList::HorWidgetList(TQWidget *topLevelWidget) : WidgetList() - , m_tqtopLevelWidget(tqtopLevelWidget) + , m_topLevelWidget(topLevelWidget) { } @@ -133,14 +133,14 @@ int HorWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It { TQWidget *w1 = TQT_TQWIDGET(item1); TQWidget *w2 = TQT_TQWIDGET(item2); - return w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x(); + return w1->mapTo(m_topLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_topLevelWidget, TQPoint(0,0)).x(); } // ----------------- -VerWidgetList::VerWidgetList(TQWidget *tqtopLevelWidget) +VerWidgetList::VerWidgetList(TQWidget *topLevelWidget) : WidgetList() - , m_tqtopLevelWidget(tqtopLevelWidget) + , m_topLevelWidget(topLevelWidget) { } @@ -157,9 +157,9 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It TQObject *page1 = 0; TabWidget *tw1 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w1, "KFormDesigner::TabWidget", page1); if (tw1) // special case - y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2; + y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2; else - y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y(); + y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y(); TQObject *page2 = 0; TabWidget *tw2 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w2, "KFormDesigner::TabWidget", page2); @@ -169,16 +169,16 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It } if (tw2) // special case - y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2; + y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2; else - y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y(); + y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y(); kdDebug() << w1->name() << ": " << y1 << " " << " | " << w2->name() << ": " << y2 << endl; - //kdDebug() << w1->name() << ": " << w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)) << " " << w1->y() - //<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_tqtopLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl; + //kdDebug() << w1->name() << ": " << w1->mapTo(m_topLevelWidget, TQPoint(0,0)) << " " << w1->y() + //<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_topLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl; return y1 - y2; } diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h index 3d078401a..5107b45c6 100644 --- a/kexi/formeditor/utils.h +++ b/kexi/formeditor/utils.h @@ -71,22 +71,22 @@ typedef TQPtrListIterator<TQWidget> WidgetListIterator; class HorWidgetList : public WidgetList { public: - HorWidgetList(TQWidget *tqtopLevelWidget); + HorWidgetList(TQWidget *topLevelWidget); virtual ~HorWidgetList(); protected: virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2); - TQWidget *m_tqtopLevelWidget; + TQWidget *m_topLevelWidget; }; //! @short A helper for sorting widgets vertically class VerWidgetList : public WidgetList { public: - VerWidgetList(TQWidget *tqtopLevelWidget); + VerWidgetList(TQWidget *topLevelWidget); virtual ~VerWidgetList(); protected: virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2); - TQWidget *m_tqtopLevelWidget; + TQWidget *m_topLevelWidget; }; /*! This function is used to remove all the child widgets from a list, and @@ -105,7 +105,7 @@ KFORMEDITOR_EXPORT void removeRecursiveEventFilter(TQObject *object, TQObject *c KFORMEDITOR_EXPORT void setRecursiveCursor(TQWidget *w, Form *form); -/*! \return the size of \a w tqchildren. This can be used eg to get widget's tqsizeHint. */ +/*! \return the size of \a w tqchildren. This can be used eg to get widget's sizeHint. */ KFORMEDITOR_EXPORT TQSize getSizeFromChildren(TQWidget *widget, const char *inheritClass=TQWIDGET_OBJECT_NAME_STRING); } diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index 178e2b748..61688ac62 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -190,7 +190,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, if (multiLine) { KTextEdit *textedit = new KTextEdit(text, TQString(), w->parentWidget()); textedit->setTextFormat(TQt::PlainText); - textedit->tqsetAlignment(align); + textedit->setAlignment(align); if (dynamic_cast<TQTextEdit*>(w)) { textedit->setWordWrap(dynamic_cast<TQTextEdit*>(w)->wordWrap()); textedit->setWrapPolicy(dynamic_cast<TQTextEdit*>(w)->wrapPolicy()); @@ -203,7 +203,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, textedit->setBackgroundMode(w->backgroundMode()); else textedit->setBackgroundMode(background); -// textedit->setPaletteBackgroundColor(textedit->tqcolorGroup().color( TQColorGroup::Base )); +// textedit->setPaletteBackgroundColor(textedit->colorGroup().color( TQColorGroup::Base )); textedit->setPaletteBackgroundColor(w->paletteBackgroundColor()); for(int i =0; i <= textedit->paragraphs(); i++) textedit->setParagraphBackgroundColor(i, w->paletteBackgroundColor()); @@ -229,7 +229,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, } else { KLineEdit *editor = new KLineEdit(text, w->parentWidget()); - editor->tqsetAlignment(align); + editor->setAlignment(align); editor->setPalette(w->palette()); editor->setFont(w->font()); editor->setGeometry(tqgeometry); @@ -253,7 +253,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, //copy properties if available WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w; - if (-1!=m_editor->tqmetaObject()->findProperty("margin", true) && -1!=subwidget->tqmetaObject()->findProperty("margin", true)) + if (-1!=m_editor->metaObject()->findProperty("margin", true) && -1!=subwidget->metaObject()->findProperty("margin", true)) m_editor->setProperty("margin", subwidget->property("margin")); //#endif //js m_handles = new ResizeHandleSet(w, container->form(), true); @@ -314,7 +314,7 @@ WidgetFactory::disableFilter(TQWidget *w, Container *container) bool WidgetFactory::editList(TQWidget *w, TQStringList &list) { - KDialogBase dialog(w->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), + KDialogBase dialog(w->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false); KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(w->name()), &dialog, "editlist"); @@ -345,7 +345,7 @@ WidgetFactory::editRichText(TQWidget *w, TQString &text) void WidgetFactory::editListView(TQListView *listview) { - EditListViewDialog dlg(((TQWidget*)listview)->tqtopLevelWidget()); + EditListViewDialog dlg(((TQWidget*)listview)->topLevelWidget()); //dlg.exec(listview); } @@ -376,7 +376,7 @@ WidgetFactory::eventFilter(TQObject *obj, TQEvent *ev) if(obj != (TQObject *)w) return false; - TQWidget *focus = w->tqtopLevelWidget()->tqfocusWidget(); + TQWidget *focus = w->topLevelWidget()->focusWidget(); if(focus && w != focus && !w->child(focus->name(), focus->className())) resetEditor(); } diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index c9f9bd9bd..9a680db5c 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -81,8 +81,8 @@ class WidgetLibraryPrivate advancedProperties.insert("backgroundMode", (char*)1);//this is rather useless advancedProperties.insert("tqlayout", (char*)1);// too large risk to break things // by providing this in propeditor - advancedProperties.insert("tqminimumSize", (char*)1); - advancedProperties.insert("tqmaximumSize", (char*)1); + advancedProperties.insert("minimumSize", (char*)1); + advancedProperties.insert("maximumSize", (char*)1); #ifdef KEXI_NO_UNFINISHED /*! @todo reenable */ advancedProperties.insert("paletteBackgroundPixmap", (char*)1); @@ -532,7 +532,7 @@ WidgetLibrary::iconName(const TQCString &classname) if(wi) return wi->pixmap(); - return TQString::tqfromLatin1("unknown_widget"); + return TQString::fromLatin1("unknown_widget"); } bool diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index d06a5c2e9..5ed8f96d4 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -287,7 +287,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) return; } - TQStrList pList = w->tqmetaObject()->propertyNames(true); + TQStrList pList = w->metaObject()->propertyNames(true); TQStrListIterator it(pList); // add subproperties if available @@ -309,7 +309,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) const TQMetaProperty *subMeta = // special case - subproperty subpropIface ? subpropIface->findMetaSubproperty(it.current()) : 0; const TQMetaProperty *meta = subMeta ? subMeta - : w->tqmetaObject()->property( w->tqmetaObject()->findProperty(*it, true), true); + : w->metaObject()->property( w->metaObject()->findProperty(*it, true), true); if (!meta) continue; const char* propertyName = meta->name(); @@ -393,7 +393,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) /*! let's forget it for now, until we have new complete events editor if (m_manager->lib()->advancedPropertiesVisible()) { // add the signals property - TQStrList strlist = w->tqmetaObject()->signalNames(true); + TQStrList strlist = w->metaObject()->signalNames(true); TQStrListIterator strIt(strlist); TQStringList list; for(; strIt.current() != 0; ++strIt) @@ -621,7 +621,7 @@ WidgetPropertySet::createPropertyCommandsInDesignMode(TQWidget* widget, else { WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widget); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widget; - if (-1 != subwidget->tqmetaObject()->findProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) { + if (-1 != subwidget->metaObject()->findProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) { ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(widget->name()); if (tree) tree->addModifiedProperty(it.key(), subwidget->property(it.key())); @@ -865,8 +865,8 @@ WidgetPropertySet::saveAlignProperty(const TQString &property) WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>( (TQWidget*)d->widgets.first() ); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : (TQWidget*)d->widgets.first(); - int count = subwidget->tqmetaObject()->findProperty("tqalignment", true); - const TQMetaProperty *meta = subwidget->tqmetaObject()->property(count, true); + int count = subwidget->metaObject()->findProperty("tqalignment", true); + const TQMetaProperty *meta = subwidget->metaObject()->property(count, true); subwidget->setProperty("tqalignment", meta->keysToValue(list)); ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup( @@ -1000,8 +1000,8 @@ WidgetPropertySet::initPropertiesDescription() d->propCaption["enabled"] = i18n("Enabled"); d->propCaption["geometry"] = i18n("Geometry"); d->propCaption["sizePolicy"] = i18n("Size Policy"); - d->propCaption["tqminimumSize"] = i18n("Minimum Size"); - d->propCaption["tqmaximumSize"] = i18n("Maximum Size"); + d->propCaption["minimumSize"] = i18n("Minimum Size"); + d->propCaption["maximumSize"] = i18n("Maximum Size"); d->propCaption["font"] = i18n("Font"); d->propCaption["cursor"] = i18n("Cursor"); d->propCaption["paletteForegroundColor"] = i18n("Foreground Color"); diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp index aa84f8313..362214a14 100644 --- a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp +++ b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp @@ -41,11 +41,11 @@ void WidgetWithSubpropertiesInterface::setSubwidget(TQWidget *widget) TQAsciiDict<char> addedSubproperies(1024); if (m_subwidget) { //remember properties in the subwidget that are not present in the parent - for( TQMetaObject *tqmetaObject = m_subwidget->tqmetaObject(); tqmetaObject; tqmetaObject = tqmetaObject->tqsuperClass()) { - const int numProperties = tqmetaObject->numProperties(); + for( TQMetaObject *metaObject = m_subwidget->metaObject(); metaObject; metaObject = metaObject->superClass()) { + const int numProperties = metaObject->numProperties(); for (int i = 0; i < numProperties; i++) { - const char *propertyName = tqmetaObject->property( i )->name(); - if (dynamic_cast<TQObject*>(this)->tqmetaObject()->findProperty( propertyName, true )==-1 + const char *propertyName = metaObject->property( i )->name(); + if (dynamic_cast<TQObject*>(this)->metaObject()->findProperty( propertyName, true )==-1 && !addedSubproperies.find( propertyName ) ) { m_subproperies.append( propertyName ); @@ -73,10 +73,10 @@ const TQMetaProperty *WidgetWithSubpropertiesInterface::findMetaSubproperty(cons if (!m_subwidget || m_subproperies.find(name) == m_subproperies.constEnd()) { return 0; } - const int index = m_subwidget->tqmetaObject()->findProperty( name, true ); + const int index = m_subwidget->metaObject()->findProperty( name, true ); if (index==-1) return 0; - return m_subwidget->tqmetaObject()->property( index, true ); + return m_subwidget->metaObject()->property( index, true ); } TQVariant WidgetWithSubpropertiesInterface::subproperty( const char * name, bool &ok ) const diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp index 4af6cae6d..34add49ab 100644 --- a/kexi/kexidb/connection.cpp +++ b/kexi/kexidb/connection.cpp @@ -765,7 +765,7 @@ TQStringList Connection::objectNames(int objType, bool* ok) if (objType==KexiDB::AnyObjectType) sql = "SELECT o_name FROM kexi__objects"; else - sql = TQString::tqfromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType); + sql = TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType); Cursor *c = executeQuery(sql); if (!c) { @@ -852,7 +852,7 @@ TQValueList<int> Connection::objectIds(int objType) return list; Cursor *c = executeQuery( - TQString::tqfromLatin1("SELECT o_id, o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType)); + TQString::fromLatin1("SELECT o_id, o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType)); if (!c) return list; for (c->moveFirst(); !c->eof(); c->moveNext()) @@ -903,12 +903,12 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem if (field->isFPNumericType() && field->precision()>0) { if (field->scale()>0) - v += TQString::tqfromLatin1("(%1,%2)").tqarg(field->precision()).tqarg(field->scale()); + v += TQString::fromLatin1("(%1,%2)").tqarg(field->precision()).tqarg(field->scale()); else - v += TQString::tqfromLatin1("(%1)").tqarg(field->precision()); + v += TQString::fromLatin1("(%1)").tqarg(field->precision()); } else if (field->type()==Field::Text && field->length()>0) - v += TQString::tqfromLatin1("(%1)").tqarg(field->length()); + v += TQString::fromLatin1("(%1)").tqarg(field->length()); if (autoinc) v += (" " + @@ -925,7 +925,7 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem if (field->defaultValue().isValid()) { TQString valToSQL( m_driver->valueToSQL( field, field->defaultValue() ) ); if (!valToSQL.isEmpty()) //for sanity - v += TQString::tqfromLatin1(" DEFAULT ") + valToSQL; + v += TQString::fromLatin1(" DEFAULT ") + valToSQL; } } sql += v; @@ -1106,14 +1106,14 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, for (Field::ListIterator it = querySchema.fieldsIterator(); (f = it.current()); ++it, number++) { if (querySchema.isColumnVisible(number)) { if (!sql.isEmpty()) - sql += TQString::tqfromLatin1(", "); + sql += TQString::fromLatin1(", "); if (f->isQueryAsterisk()) { if (!singleTable && static_cast<QueryAsterisk*>(f)->isSingleTableAsterisk()) //single-table * sql += escapeIdentifier(f->table()->name(), options.identifierEscaping) + - TQString::tqfromLatin1(".*"); + TQString::fromLatin1(".*"); else //all-tables * (or simplified table.* when there's only one table) - sql += TQString::tqfromLatin1("*"); + sql += TQString::fromLatin1("*"); } else { if (f->isExpression()) { @@ -1137,7 +1137,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, } TQString aliasString = TQString(querySchema.columnAlias(number)); if (!aliasString.isEmpty()) - sql += (TQString::tqfromLatin1(" AS ") + aliasString); + sql += (TQString::fromLatin1(" AS ") + aliasString); //! @todo add option that allows to omit "AS" keyword } LookupFieldSchema *lookupFieldSchema = (options.addVisibleLookupColumns && f->table()) @@ -1159,7 +1159,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, { //add LEFT OUTER JOIN if (!s_additional_joins.isEmpty()) - s_additional_joins += TQString::tqfromLatin1(" "); + s_additional_joins += TQString::fromLatin1(" "); TQString internalUniqueTableAlias( TQString("__kexidb_") + lookupTable->name() + "_" + TQString::number(internalUniqueTableAliasNumber++) ); s_additional_joins += TQString("LEFT OUTER JOIN %1 AS %2 ON %3.%4=%5.%6") @@ -1177,13 +1177,13 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, /* not true //table should be added after FROM if (!s_from_additional.isEmpty()) - s_from_additional += TQString::tqfromLatin1(", "); + s_from_additional += TQString::fromLatin1(", "); s_from_additional += escapeIdentifier(visibleField->table()->name(), options.identifierEscaping); */ } #endif if (!s_additional_fields.isEmpty()) - s_additional_fields += TQString::tqfromLatin1(", "); + s_additional_fields += TQString::fromLatin1(", "); // s_additional_fields += (internalUniqueTableAlias + "." //escapeIdentifier(visibleField->table()->name(), options.identifierEscaping) + "." // escapeIdentifier(visibleField->name(), options.identifierEscaping)); //! @todo Add lookup schema option for separator other than ' ' or even option for placeholders like "Name ? ?" @@ -1216,7 +1216,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, } //add LEFT OUTER JOIN if (!s_additional_joins.isEmpty()) - s_additional_joins += TQString::tqfromLatin1(" "); + s_additional_joins += TQString::fromLatin1(" "); TQString internalUniqueQueryAlias( kexidb_subquery_prefix + lookupQuery->name() + "_" + TQString::number(internalUniqueQueryAliasNumber++) ); @@ -1229,7 +1229,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, .tqarg(escapeIdentifier(boundColumnInfo->aliasOrName(), options.identifierEscaping)); if (!s_additional_fields.isEmpty()) - s_additional_fields += TQString::tqfromLatin1(", "); + s_additional_fields += TQString::fromLatin1(", "); const TQValueList<uint> visibleColumns( lookupFieldSchema->visibleColumns() ); TQString expression; foreach (TQValueList<uint>::ConstIterator, visibleColumnsIt, visibleColumns) { @@ -1260,12 +1260,12 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, //add lookup fields if (!s_additional_fields.isEmpty()) - sql += (TQString::tqfromLatin1(", ") + s_additional_fields); + sql += (TQString::fromLatin1(", ") + s_additional_fields); if (options.alsoRetrieveROWID) { //append rowid column TQString s; if (!sql.isEmpty()) - s = TQString::tqfromLatin1(", "); + s = TQString::fromLatin1(", "); if (querySchema.masterTable()) s += (escapeIdentifier(querySchema.masterTable()->name())+"."); s += m_driver->beh->ROW_ID_FIELD_NAME; @@ -1275,7 +1275,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, sql.prepend("SELECT "); TableSchema::List* tables = querySchema.tables(); if ((tables && !tables->isEmpty()) || !subqueries_for_lookup_data.isEmpty()) { - sql += TQString::tqfromLatin1(" FROM "); + sql += TQString::fromLatin1(" FROM "); TQString s_from; if (tables) { TableSchema *table; @@ -1284,15 +1284,15 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, ++it, number++) { if (!s_from.isEmpty()) - s_from += TQString::tqfromLatin1(", "); + s_from += TQString::fromLatin1(", "); s_from += escapeIdentifier(table->name(), options.identifierEscaping); TQString aliasString = TQString(querySchema.tableAlias(number)); if (!aliasString.isEmpty()) - s_from += (TQString::tqfromLatin1(" AS ") + aliasString); + s_from += (TQString::fromLatin1(" AS ") + aliasString); } /*unused if (!s_from_additional.isEmpty()) {//additional tables list needed for lookup fields if (!s_from.isEmpty()) - s_from += TQString::tqfromLatin1(", "); + s_from += TQString::fromLatin1(", "); s_from += s_from_additional; }*/ } @@ -1302,10 +1302,10 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, subqueries_for_lookup_data.current(); ++it, subqueries_for_lookup_data_counter++) { if (!s_from.isEmpty()) - s_from += TQString::tqfromLatin1(", "); - s_from += TQString::tqfromLatin1("("); + s_from += TQString::fromLatin1(", "); + s_from += TQString::fromLatin1("("); s_from += selectStatement( *it.current(), params, options ); - s_from += TQString::tqfromLatin1(") AS %1%2") + s_from += TQString::fromLatin1(") AS %1%2") .tqarg(kexidb_subquery_prefix).tqarg(subqueries_for_lookup_data_counter); } sql += s_from; @@ -1315,7 +1315,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, //JOINS if (!s_additional_joins.isEmpty()) { - sql += TQString::tqfromLatin1(" ") + s_additional_joins + TQString::tqfromLatin1(" "); + sql += TQString::fromLatin1(" ") + s_additional_joins + TQString::fromLatin1(" "); } //@todo: we're using WHERE for joins now; use INNER/LEFT/RIGHT JOIN later @@ -1328,24 +1328,24 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, wasWhere = true; } else - s_where += TQString::tqfromLatin1(" AND "); + s_where += TQString::fromLatin1(" AND "); Field::Pair *pair; TQString s_where_sub; for (TQPtrListIterator<Field::Pair> p_it(*rel->fieldPairs()); (pair = p_it.current()); ++p_it) { if (!s_where_sub.isEmpty()) - s_where_sub += TQString::tqfromLatin1(" AND "); + s_where_sub += TQString::fromLatin1(" AND "); s_where_sub += ( escapeIdentifier(pair->first->table()->name(), options.identifierEscaping) + - TQString::tqfromLatin1(".") + + TQString::fromLatin1(".") + escapeIdentifier(pair->first->name(), options.identifierEscaping) + - TQString::tqfromLatin1(" = ") + + TQString::fromLatin1(" = ") + escapeIdentifier(pair->second->table()->name(), options.identifierEscaping) + - TQString::tqfromLatin1(".") + + TQString::fromLatin1(".") + escapeIdentifier(pair->second->name(), options.identifierEscaping)); } if (rel->fieldPairs()->count()>1) { s_where_sub.prepend("("); - s_where_sub += TQString::tqfromLatin1(")"); + s_where_sub += TQString::fromLatin1(")"); } s_where += s_where_sub; } @@ -1362,7 +1362,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, } } if (!s_where.isEmpty()) - sql += TQString::tqfromLatin1(" WHERE ") + s_where; + sql += TQString::fromLatin1(" WHERE ") + s_where; //! \todo (js) add other sql parts //(use wasWhere here) @@ -1424,8 +1424,8 @@ TQ_ULLONG Connection::lastInsertedAutoIncValue(const TQString& aiFieldName, cons } RowData rdata; if (row_id<=0 || true!=querySingleRecord( - TQString::tqfromLatin1("SELECT ") + tableName + TQString::tqfromLatin1(".") + aiFieldName + TQString::tqfromLatin1(" FROM ") + tableName - + TQString::tqfromLatin1(" WHERE ") + m_driver->beh->ROW_ID_FIELD_NAME + TQString::tqfromLatin1("=") + TQString::number(row_id), rdata)) + TQString::fromLatin1("SELECT ") + tableName + TQString::fromLatin1(".") + aiFieldName + TQString::fromLatin1(" FROM ") + tableName + + TQString::fromLatin1(" WHERE ") + m_driver->beh->ROW_ID_FIELD_NAME + TQString::fromLatin1("=") + TQString::number(row_id), rdata)) { // KexiDBDbg << "Connection::lastInsertedAutoIncValue(): row_id<=0 || true!=querySingleRecord()" << endl; return (TQ_ULLONG)-1; //ULL; @@ -1838,12 +1838,12 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam } // the new table owns the previous table's id: - if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__objects SET o_id=%1 WHERE o_id=%2 AND o_type=%3") + if (!executeSQL(TQString::fromLatin1("UPDATE kexi__objects SET o_id=%1 WHERE o_id=%2 AND o_type=%3") .tqarg(origID).tqarg(tableSchema.id()).tqarg((int)TableObjectType))) { return false; } - if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__fields SET t_id=%1 WHERE t_id=%2") + if (!executeSQL(TQString::fromLatin1("UPDATE kexi__fields SET t_id=%1 WHERE t_id=%2") .tqarg(origID).tqarg(tableSchema.id()))) { return false; @@ -1861,7 +1861,7 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam // Update kexi__objects //TODO - if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__objects SET o_name=%1 WHERE o_id=%2") + if (!executeSQL(TQString::fromLatin1("UPDATE kexi__objects SET o_name=%1 WHERE o_id=%2") .tqarg(m_driver->escapeString(tableSchema.name())).tqarg(tableSchema.id()))) { alterTableName_ERR; @@ -1889,7 +1889,7 @@ bool Connection::drv_alterTableName(TableSchema& tableSchema, const TQString& ne const TQString oldTableName = tableSchema.name(); tableSchema.setName(newName); - if (!executeSQL(TQString::tqfromLatin1("ALTER TABLE %1 RENAME TO %2") + if (!executeSQL(TQString::fromLatin1("ALTER TABLE %1 RENAME TO %2") .tqarg(escapeIdentifier(oldTableName)).tqarg(escapeIdentifier(newName)))) { tableSchema.setName(oldTableName); //restore old name @@ -2300,7 +2300,7 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata ) tristate Connection::loadObjectSchemaData( int objectID, SchemaData &sdata ) { RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( + if (true!=querySingleRecord(TQString::fromLatin1( "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1") .tqarg(objectID), data)) return cancelled; @@ -2310,7 +2310,7 @@ tristate Connection::loadObjectSchemaData( int objectID, SchemaData &sdata ) tristate Connection::loadObjectSchemaData( int objectType, const TQString& objectName, SchemaData &sdata ) { RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1("SELECT o_id, o_type, o_name, o_caption, o_desc " + if (true!=querySingleRecord(TQString::fromLatin1("SELECT o_id, o_type, o_name, o_caption, o_desc " "FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2") .tqarg(objectType).tqarg(m_driver->valueToSQL(Field::Text, objectName.lower())), data)) return cancelled; @@ -2324,7 +2324,7 @@ bool Connection::storeObjectSchemaData( SchemaData &sdata, bool newObject ) return false; if (newObject) { int existingID; - if (true == querySingleNumber(TQString::tqfromLatin1( + if (true == querySingleNumber(TQString::fromLatin1( "SELECT o_id FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2") .tqarg(sdata.type()).tqarg(m_driver->valueToSQL(Field::Text, sdata.name().lower())), existingID)) { @@ -2807,7 +2807,7 @@ KexiDB::TableSchema* Connection::setupTableSchema( const RowData &data ) KexiDB::Cursor *cursor; if (!(cursor = executeQuery( - TQString::tqfromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, " + TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, " "f_options, f_default, f_order, f_caption, f_help" " FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->m_id) ))) { @@ -2867,7 +2867,7 @@ TableSchema* Connection::tableSchema( const TQString& tableName ) return t; //not found: retrieve schema RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( + if (true!=querySingleRecord(TQString::fromLatin1( "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2") .tqarg(m_tableName).tqarg(KexiDB::TableObjectType), data)) return 0; @@ -2882,7 +2882,7 @@ TableSchema* Connection::tableSchema( int tableId ) return t; //not found: retrieve schema RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( + if (true!=querySingleRecord(TQString::fromLatin1( "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1") .tqarg(tableId), data)) return 0; @@ -2904,7 +2904,7 @@ bool Connection::storeDataBlock( int objectID, const TQString &dataString, const { if (objectID<=0) return false; - TQString sql(TQString::tqfromLatin1("SELECT kexi__objectdata.o_id FROM kexi__objectdata WHERE o_id=%1").tqarg(objectID)); + TQString sql(TQString::fromLatin1("SELECT kexi__objectdata.o_id FROM kexi__objectdata WHERE o_id=%1").tqarg(objectID)); TQString sql_sub( KexiDB::sqlWhere(m_driver, KexiDB::Field::Text, "o_sub_id", dataID) ); bool ok, exists; @@ -2917,7 +2917,7 @@ bool Connection::storeDataBlock( int objectID, const TQString &dataString, const + " WHERE o_id=" + TQString::number(objectID) + " AND " + sql_sub ); } return executeSQL( - TQString::tqfromLatin1("INSERT INTO kexi__objectdata (o_id, o_data, o_sub_id) VALUES (") + TQString::fromLatin1("INSERT INTO kexi__objectdata (o_id, o_data, o_sub_id) VALUES (") + TQString::number(objectID) +"," + m_driver->valueToSQL( KexiDB::Field::LongText, dataString ) + "," + m_driver->valueToSQL( KexiDB::Field::Text, dataID ) + ")" ); } @@ -2974,7 +2974,7 @@ QuerySchema* Connection::querySchema( const TQString& queryName ) return q; //not found: retrieve schema RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( + if (true!=querySingleRecord(TQString::fromLatin1( "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2") .tqarg(m_queryName).tqarg(KexiDB::QueryObjectType), data)) return 0; @@ -2990,7 +2990,7 @@ QuerySchema* Connection::querySchema( int queryId ) //not found: retrieve schema clearError(); RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( + if (true!=querySingleRecord(TQString::fromLatin1( "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1").tqarg(queryId), data)) return 0; @@ -3351,11 +3351,11 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf return false; } RowData aif_data; - TQString getAutoIncForInsertedValue = TQString::tqfromLatin1("SELECT ") + TQString getAutoIncForInsertedValue = TQString::fromLatin1("SELECT ") + query.autoIncrementSQLFieldsList(m_driver) - + TQString::tqfromLatin1(" FROM ") + + TQString::fromLatin1(" FROM ") + escapeIdentifier(id_columnInfo->field->table()->name()) - + TQString::tqfromLatin1(" WHERE ") + + TQString::fromLatin1(" WHERE ") + escapeIdentifier(id_columnInfo->field->name()) + "=" + TQString::number(last_id); if (true!=querySingleRecord(getAutoIncForInsertedValue, aif_data)) { diff --git a/kexi/kexidb/dbproperties.cpp b/kexi/kexidb/dbproperties.cpp index 44b69192e..27b6a5b29 100644 --- a/kexi/kexidb/dbproperties.cpp +++ b/kexi/kexidb/dbproperties.cpp @@ -38,7 +38,7 @@ bool DatabaseProperties::setValue( const TQString& _name, const TQVariant& value bool ok; //we need to know whether update or insert bool exists = m_conn->resultExists( - TQString::tqfromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1") + TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1") .tqarg(m_conn->driver()->escapeString(name)), ok); if (!ok) { setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name)); @@ -47,7 +47,7 @@ bool DatabaseProperties::setValue( const TQString& _name, const TQVariant& value if (exists) { if (!m_conn->executeSQL( - TQString::tqfromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2") + TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2") .tqarg(m_conn->driver()->escapeString(value.toString())) .tqarg(m_conn->driver()->escapeString(name)))) { @@ -58,7 +58,7 @@ bool DatabaseProperties::setValue( const TQString& _name, const TQVariant& value } if (!m_conn->executeSQL( - TQString::tqfromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)") + TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)") .tqarg(m_conn->driver()->escapeString(name)) .tqarg(m_conn->driver()->escapeString(value.toString())))) { @@ -76,7 +76,7 @@ bool DatabaseProperties::setCaption( const TQString& _name, const TQString& capt bool ok; //we need to know whether update or insert bool exists = m_conn->resultExists( - TQString::tqfromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1") + TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1") .tqarg(m_conn->driver()->escapeString(name)), ok); if (!ok) { setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name)); @@ -85,7 +85,7 @@ bool DatabaseProperties::setCaption( const TQString& _name, const TQString& capt if (exists) { if (!m_conn->executeSQL( - TQString::tqfromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2") + TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2") .tqarg(m_conn->driver()->escapeString(caption)) .tqarg(m_conn->driver()->escapeString(name)))) { @@ -96,7 +96,7 @@ bool DatabaseProperties::setCaption( const TQString& _name, const TQString& capt } if (!m_conn->executeSQL( - TQString::tqfromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)") + TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)") .tqarg(m_conn->driver()->escapeString(name)) .tqarg(m_conn->driver()->escapeString(caption)))) { @@ -111,7 +111,7 @@ TQVariant DatabaseProperties::value( const TQString& _name ) TQString result; TQString name(_name.stripWhiteSpace()); if (true!=m_conn->querySingleString( - TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property=") + TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=") + m_conn->driver()->escapeString(name), result)) { m_conn->setError(ERR_NO_DB_PROPERTY, i18n("Could not read database property \"%1\".").tqarg(name)); return TQVariant(); @@ -126,7 +126,7 @@ TQString DatabaseProperties::caption( const TQString& _name ) //captions have ' ' prefix name.prepend(" "); if (true!=m_conn->querySingleString( - TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property=") + TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=") + m_conn->driver()->escapeString(name), result)) { setError(m_conn, i18n("Could not read database property \"%1\".").tqarg(name)); return TQString(); @@ -138,8 +138,8 @@ TQStringList DatabaseProperties::names() { TQStringList result; if (true!=m_conn->queryStringList( - TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property NOT LIKE ") - + m_conn->driver()->escapeString(TQString::tqfromLatin1(" %%")), result, 0 /*0-th*/)) { + TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property NOT LIKE ") + + m_conn->driver()->escapeString(TQString::fromLatin1(" %%")), result, 0 /*0-th*/)) { // ^^ exclude captions setError(m_conn, i18n("Could not read database properties.")); return TQStringList(); diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index 4db1b4001..5d8f8d488 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -135,7 +135,7 @@ TQString Driver::fileDBDriverMimeType() const { return d->fileDBDriverMimeType; } TQString Driver::defaultFileBasedDriverMimeType() -{ return TQString::tqfromLatin1("application/x-kexiproject-sqlite3"); } +{ return TQString::fromLatin1("application/x-kexiproject-sqlite3"); } TQString Driver::defaultFileBasedDriverName() { @@ -282,7 +282,7 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const return dateTimeToSQL( v.toDateTime() ); case Field::BLOB: { if (v.toByteArray().isEmpty()) - return TQString::tqfromLatin1("NULL"); + return TQString::fromLatin1("NULL"); if (v.type()==TQVariant::String) return escapeBLOB(v.toString().utf8()); return escapeBLOB(v.toByteArray()); diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index 0a7ff5742..5abacc948 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -425,7 +425,7 @@ TQString DriverManager::possibleProblemsInfoMsg() const for (TQStringList::ConstIterator it = d_int->possibleProblems.constBegin(); it!=d_int->possibleProblems.constEnd(); ++it) { - str += (TQString::tqfromLatin1("<li>") + *it + TQString::tqfromLatin1("</li>")); + str += (TQString::fromLatin1("<li>") + *it + TQString::fromLatin1("</li>")); } str += "</ul>"; return str; diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp index 01d326af2..10654e7e3 100644 --- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp @@ -125,7 +125,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const break; } if (i >= old_length) { //no characters to escape - return TQString::tqfromLatin1("'") + str + TQString::tqfromLatin1("'"); + return TQString::fromLatin1("'") + str + TQString::fromLatin1("'"); } TQChar *new_string = new TQChar[ old_length * 3 + 1 ]; // a worst case approximation diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp index c81f04adb..faa7b5825 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp @@ -128,7 +128,7 @@ bool pqxxSqlConnection::drv_getDatabasesList( TQStringList &list ) // Read value of column 0 into a string N c[0].to(N); // Copy the result into the return list - list << TQString::tqfromLatin1 (N.c_str()); + list << TQString::fromLatin1 (N.c_str()); } return true; } @@ -190,15 +190,15 @@ bool pqxxSqlConnection::drv_useDatabase( const TQString &dbName, bool *cancelled if (data()->port == 0) data()->port = 5432; - conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(data()->port); + conninfo += TQString::fromLatin1(" port='%1'").tqarg(data()->port); - conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(dbName); + conninfo += TQString::fromLatin1(" dbname='%1'").tqarg(dbName); if (!data()->userName.isNull()) - conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(data()->userName); + conninfo += TQString::fromLatin1(" user='%1'").tqarg(data()->userName); if (!data()->password.isNull()) - conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(data()->password); + conninfo += TQString::fromLatin1(" password='%1'").tqarg(data()->password); try { diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.h b/kexi/kexidb/drivers/pqxx/pqxxcursor.h index 637a33f39..8a61978d6 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxcursor.h +++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.h @@ -79,7 +79,7 @@ inline TQVariant pgsqlCStrToVariant(const pqxx::result::field& r) switch(r.type()) { case BOOLOID: - return TQString::tqfromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting + return TQString::fromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting case INT2OID: case INT4OID: case INT8OID: diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp index 333df590c..8967bc5e5 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp @@ -133,9 +133,9 @@ bool pqxxSqlDriver::isSystemDatabaseName( const TQString& n ) const // TQString pqxxSqlDriver::escapeString( const TQString& str) const { - return TQString::tqfromLatin1("'") + return TQString::fromLatin1("'") + TQString::fromAscii( pqxx::sqlesc(std::string(str.utf8())).c_str() ) - + TQString::tqfromLatin1("'"); + + TQString::fromLatin1("'"); } //================================================================================== @@ -172,7 +172,7 @@ TQString pqxxSqlDriver::valueToSQL( uint ftype, const TQVariant& v ) const // use SQL compliant TRUE or FALSE as described here // http://www.postgresql.org/docs/8.0/interactive/datatype-boolean.html // 1 or 0 does not work - return v.toInt()==0 ? TQString::tqfromLatin1("FALSE") : TQString::tqfromLatin1("TRUE"); + return v.toInt()==0 ? TQString::fromLatin1("FALSE") : TQString::fromLatin1("TRUE"); } return Driver::valueToSQL(ftype, v); } diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp index 631f3bc6c..b10d5383e 100644 --- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp +++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp @@ -324,9 +324,9 @@ TQString SQLiteConnection::serverResultName() { TQString r = #ifdef SQLITE2 - TQString::tqfromLatin1( sqlite_error_string(d->res) ); + TQString::fromLatin1( sqlite_error_string(d->res) ); #else //SQLITE3 - TQString(); //tqfromLatin1( d->result_name ); + TQString(); //fromLatin1( d->result_name ); #endif return r.isEmpty() ? Connection::serverResultName() : r; } @@ -395,7 +395,7 @@ bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQStri //TODO indices, etc.??? // 3. copy all rows to the new table - if (!executeSQL(TQString::tqfromLatin1("INSERT INTO %1 SELECT * FROM %2") + if (!executeSQL(TQString::fromLatin1("INSERT INTO %1 SELECT * FROM %2") .tqarg(escapeIdentifier(tableSchema.name())).tqarg(escapeIdentifier(oldTableName)))) { drv_alterTableName_ERR; diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp index 5239127ca..20d80f9c6 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp @@ -476,19 +476,19 @@ void SQLiteCursor::storeCurrentRow(RowData &data) const case Field::Integer: data[i] = TQVariant( TQCString(*col).toInt() ); case Field::BigInteger: - data[i] = TQVariant( TQString::tqfromLatin1(*col).toLongLong() ); + data[i] = TQVariant( TQString::fromLatin1(*col).toLongLong() ); case Field::Boolean: - data[i] = TQVariant( sqliteStringToBool(TQString::tqfromLatin1(*col)), 1 ); + data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(*col)), 1 ); break; case Field::Date: - data[i] = TQDate::fromString( TQString::tqfromLatin1(*col), Qt::ISODate ); + data[i] = TQDate::fromString( TQString::fromLatin1(*col), Qt::ISODate ); break; case Field::Time: //TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull() - data[i] = KexiUtils::stringToHackedTQTime(TQString::tqfromLatin1(*col)); + data[i] = KexiUtils::stringToHackedTQTime(TQString::fromLatin1(*col)); break; case Field::DateTime: { - TQString tmp( TQString::tqfromLatin1(*col) ); + TQString tmp( TQString::fromLatin1(*col) ); tmp[10] = 'T'; data[i] = TQDateTime::fromString( tmp, Qt::ISODate ); break; @@ -548,9 +548,9 @@ int SQLiteCursor::serverResult() TQString SQLiteCursor::serverResultName() { #ifdef SQLITE2 - return TQString::tqfromLatin1( sqlite_error_string(d->res) ); + return TQString::fromLatin1( sqlite_error_string(d->res) ); #else //SQLITE3 - return TQString::tqfromLatin1( d->result_name ); + return TQString::fromLatin1( d->result_name ); #endif } diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp index 35ab8d70e..034154bfd 100644 --- a/kexi/kexidb/expression.cpp +++ b/kexi/kexidb/expression.cpp @@ -601,13 +601,13 @@ void QueryParameterExpr::setType(Field::Type type) TQString QueryParameterExpr::debugString() { - return TQString("QueryParameterExpr('") + TQString::tqfromLatin1("[%2]").tqarg(value.toString()) + return TQString("QueryParameterExpr('") + TQString::fromLatin1("[%2]").tqarg(value.toString()) + TQString("',type=%1)").tqarg(Driver::defaultSQLTypeName(type())); } TQString QueryParameterExpr::toString(QuerySchemaParameterValueListIterator* params) { - return params ? params->getPreviousValueAsString(type()) : TQString::tqfromLatin1("[%2]").tqarg(value.toString()); + return params ? params->getPreviousValueAsString(type()) : TQString::fromLatin1("[%2]").tqarg(value.toString()); } void QueryParameterExpr::getQueryParameters(QuerySchemaParameterList& params) diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp index 33e9e929a..6666fcfd9 100644 --- a/kexi/kexidb/field.cpp +++ b/kexi/kexidb/field.cpp @@ -589,12 +589,12 @@ TQString Field::debugString() const dbg += (conn && conn->driver()) ? conn->driver()->sqlTypeName(type()) : Driver::defaultSQLTypeName(type()); if (isFPNumericType() && m_precision>0) { if (scale()>0) - dbg += TQString::tqfromLatin1("(%1,%2)").tqarg(m_precision).tqarg(scale()); + dbg += TQString::fromLatin1("(%1,%2)").tqarg(m_precision).tqarg(scale()); else - dbg += TQString::tqfromLatin1("(%1)").tqarg(m_precision); + dbg += TQString::fromLatin1("(%1)").tqarg(m_precision); } else if (m_type==Field::Text && m_length>0) - dbg += TQString::tqfromLatin1("(%1)").tqarg(m_length); + dbg += TQString::fromLatin1("(%1)").tqarg(m_length); if (m_constraints & Field::AutoInc) dbg += " AUTOINC"; if (m_constraints & Field::Unique) @@ -664,10 +664,10 @@ void Field::setCustomProperty(const TQCString& propertyName, const TQVariant& va //------------------------------------------------------- #define ADDTYPE(type, i18, str) this->at(Field::type) = i18; \ this->at(Field::type+Field::LastType+1) = str; \ - str2num.insert(TQString::tqfromLatin1(str).lower(), type) + str2num.insert(TQString::fromLatin1(str).lower(), type) #define ADDGROUP(type, i18, str) this->at(Field::type) = i18; \ this->at(Field::type+Field::LastTypeGroup+1) = str; \ - str2num.insert(TQString::tqfromLatin1(str).lower(), type) + str2num.insert(TQString::fromLatin1(str).lower(), type) Field::FieldTypeNames::FieldTypeNames() : TQValueVector<TQString>() diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h index fbf303a9a..9db4f5a66 100644 --- a/kexi/kexidb/fieldlist.h +++ b/kexi/kexidb/fieldlist.h @@ -143,13 +143,13 @@ class KEXI_DB_EXPORT FieldList See @ref Connection::selectStatement() for example use. \a drvEscaping can be used to alter default escaping type. */ - TQString sqlFieldsList(Driver *driver, const TQString& separator = TQString::tqfromLatin1(","), + TQString sqlFieldsList(Driver *driver, const TQString& separator = TQString::fromLatin1(","), const TQString& tableAlias = TQString(), int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary); /*! Like above, but this is convenient static function, so you can pass any \a list here. */ static TQString sqlFieldsList(Field::List* list, Driver *driver, - const TQString& separator = TQString::tqfromLatin1(","), const TQString& tableAlias = TQString(), + const TQString& separator = TQString::fromLatin1(","), const TQString& tableAlias = TQString(), int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary); /*! @internal Renames field \a oldName to \a newName. diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index b77f76a3e..cff98a31d 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -53,7 +53,7 @@ TQString QueryColumnInfo::debugString() const { return field->name() + ( alias.isEmpty() ? TQString() - : (TQString::tqfromLatin1(" AS ") + TQString(alias)) ); + : (TQString::fromLatin1(" AS ") + TQString(alias)) ); } //======================================= @@ -816,7 +816,7 @@ TQString QuerySchema::debugString() if (tablePos>=0) { TQCString tAlias = tableAlias(tablePos); if (!tAlias.isEmpty()) { - dbg2 += (TQString::tqfromLatin1(" field \"") + FieldList::field(i)->name() + dbg2 += (TQString::fromLatin1(" field \"") + FieldList::field(i)->name() + "\" uses alias \"" + TQString(tAlias) + "\" of table \"" + d->tables.at(tablePos)->name() + "\"\n"); } @@ -1291,7 +1291,7 @@ void QuerySchema::computeFieldsExpanded() // (the expression object will be owned by column info) visibleColumn = new Field(); visibleColumn->setName( - TQString::tqfromLatin1("[multiple_visible_fields_%1]") + TQString::fromLatin1("[multiple_visible_fields_%1]") .tqarg( ++numberOfColumnsWithMultipleVisibleFields )); visibleColumn->setExpression( new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/)); @@ -1310,7 +1310,7 @@ void QuerySchema::computeFieldsExpanded() if (!table( visibleField->table()->name() )) { } if (!sql.isEmpty()) - sql += TQString::tqfromLatin1(", "); + sql += TQString::fromLatin1(", "); sql += (escapeIdentifier(visibleField->table()->name(), drvEscaping) + "." + escapeIdentifier(visibleField->name(), drvEscaping)); }*/ @@ -1351,7 +1351,7 @@ void QuerySchema::computeFieldsExpanded() // (the expression object will be owned by column info) visibleColumn = new Field(); visibleColumn->setName( - TQString::tqfromLatin1("[multiple_visible_fields_%1]") + TQString::fromLatin1("[multiple_visible_fields_%1]") .tqarg( ++numberOfColumnsWithMultipleVisibleFields )); visibleColumn->setExpression( new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/)); @@ -1370,7 +1370,7 @@ void QuerySchema::computeFieldsExpanded() if (!table( visibleField->table()->name() )) { } if (!sql.isEmpty()) - sql += TQString::tqfromLatin1(", "); + sql += TQString::fromLatin1(", "); sql += (escapeIdentifier(visibleField->table()->name(), drvEscaping) + "." + escapeIdentifier(visibleField->name(), drvEscaping)); }*/ @@ -1508,7 +1508,7 @@ void QuerySchema::computeFieldsExpanded() ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index ); } else { - const TQString key( TQString::tqfromLatin1("[multiple_visible_fields_%1]_%2.%3") + const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3") .tqarg( ++numberOfColumnsWithMultipleVisibleFields ) .tqarg(ci->field->table()->name()).tqarg(ci->field->name()) ); uint *index = lookup_dict[ key ]; @@ -1542,7 +1542,7 @@ void QuerySchema::computeFieldsExpanded() ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index ); } else { - const TQString key( TQString::tqfromLatin1("[multiple_visible_fields_%1]_%2.%3") + const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3") .tqarg( ++numberOfColumnsWithMultipleVisibleFields ) .tqarg(ci->field->table()->name()).tqarg(ci->field->name()) ); uint *index = lookup_dict[ key ]; diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index 9fa9ca018..8551a0ef3 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -159,9 +159,9 @@ void KexiDB::getHTMLErrorMesage(Object* obj, TQString& msg, TQString &details) if (!details.isEmpty() && !details.startsWith("<qt>")) { if (details.startsWith("<p>")) - details = TQString::tqfromLatin1("<qt>")+details; + details = TQString::fromLatin1("<qt>")+details; else - details = TQString::tqfromLatin1("<qt><p>")+details; + details = TQString::fromLatin1("<qt><p>")+details; } } @@ -493,7 +493,7 @@ void KexiDB::connectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData int KexiDB::rowCount(Connection &conn, const TQString& sql) { int count = -1; //will be changed only on success of querySingleNumber() - TQString selectSql( TQString::tqfromLatin1("SELECT COUNT() FROM (") + sql + ")" ); + TQString selectSql( TQString::fromLatin1("SELECT COUNT() FROM (") + sql + ")" ); conn.querySingleNumber(selectSql, count); return count; } @@ -507,7 +507,7 @@ int KexiDB::rowCount(const KexiDB::TableSchema& tableSchema) } int count = -1; //will be changed only on success of querySingleNumber() tableSchema.connection()->querySingleNumber( - TQString::tqfromLatin1("SELECT COUNT(*) FROM ") + TQString::fromLatin1("SELECT COUNT(*) FROM ") + tableSchema.connection()->driver()->escapeIdentifier(tableSchema.name()), count ); @@ -523,7 +523,7 @@ int KexiDB::rowCount(KexiDB::QuerySchema& querySchema) } int count = -1; //will be changed only on success of querySingleNumber() querySchema.connection()->querySingleNumber( - TQString::tqfromLatin1("SELECT COUNT(*) FROM (") + TQString::fromLatin1("SELECT COUNT(*) FROM (") + querySchema.connection()->selectStatement(querySchema) + ")", count ); @@ -965,7 +965,7 @@ TQDomElement KexiDB::saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& p TQDomElement numberEl( doc.createElement("bool") ); el.appendChild( numberEl ); numberEl.appendChild( doc.createTextNode( - value ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("false") ) ); + value ? TQString::fromLatin1("true") : TQString::fromLatin1("false") ) ); return el; } @@ -998,9 +998,9 @@ TQVariant KexiDB::emptyValueForType( KexiDB::Field::Type type ) return val; else { //special cases if (type==Field::Date) - return TQDate::tqcurrentDate(); + return TQDate::currentDate(); if (type==Field::DateTime) - return TQDateTime::tqcurrentDateTime(); + return TQDateTime::currentDateTime(); if (type==Field::Time) return TQTime::currentTime(); } @@ -1047,9 +1047,9 @@ TQVariant KexiDB::notEmptyValueForType( KexiDB::Field::Type type ) return val; else { //special cases if (type==Field::Date) - return TQDate::tqcurrentDate(); + return TQDate::currentDate(); if (type==Field::DateTime) - return TQDateTime::tqcurrentDateTime(); + return TQDateTime::currentDateTime(); if (type==Field::Time) return TQTime::currentTime(); } @@ -1076,11 +1076,11 @@ TQString KexiDB::escapeBLOB(const TQByteArray& array, BLOBEscapingType type) return TQString(); } if (type == BLOBEscapeXHex) - str = TQString::tqfromLatin1("X'"); + str = TQString::fromLatin1("X'"); else if (type == BLOBEscape0xHex) - str = TQString::tqfromLatin1("0x"); + str = TQString::fromLatin1("0x"); else if (type == BLOBEscapeOctal) - str = TQString::tqfromLatin1("'"); + str = TQString::fromLatin1("'"); int new_length = str.length(); //after X' or 0x, etc. if (type == BLOBEscapeOctal) { diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h index ec807d340..334ea20c1 100644 --- a/kexi/kexidb/utils.h +++ b/kexi/kexidb/utils.h @@ -454,11 +454,11 @@ namespace KexiDB return TQString::fromUtf8(data, length); if (f->isIntegerType()) { if (f->type()==KexiDB::Field::BigInteger) - return TQVariant( TQString::tqfromLatin1(data, length).toLongLong() ); - return TQVariant( TQString::tqfromLatin1(data, length).toInt() ); + return TQVariant( TQString::fromLatin1(data, length).toLongLong() ); + return TQVariant( TQString::fromLatin1(data, length).toInt() ); } if (f->isFPNumericType()) - return TQString::tqfromLatin1(data, length).toDouble(); + return TQString::fromLatin1(data, length).toDouble(); if (f->type()==KexiDB::Field::BLOB) { TQByteArray ba; ba.duplicate(data, length); diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp index da5f7f964..dc1754ca6 100644 --- a/kexi/kexiutils/identifier.cpp +++ b/kexi/kexiutils/identifier.cpp @@ -48,7 +48,7 @@ inline TQString char2Identifier(const TQChar& c) if (c.tqunicode() >= TRANSLITERATION_TABLE_SIZE) return TQString(TQChar('_')); const char *const s = transliteration_table[c.tqunicode()]; - return s ? TQString::tqfromLatin1(s) : TQString(TQChar('_')); + return s ? TQString::fromLatin1(s) : TQString(TQChar('_')); } TQString KexiUtils::string2Identifier(const TQString &s) diff --git a/kexi/kexiutils/longlongvalidator.cpp b/kexi/kexiutils/longlongvalidator.cpp index ca3a42dd8..e7cce8671 100644 --- a/kexi/kexiutils/longlongvalidator.cpp +++ b/kexi/kexiutils/longlongvalidator.cpp @@ -53,7 +53,7 @@ TQValidator::State LongLongValidator::validate( TQString &str, int & ) const if (m_base > 10) newStr = newStr.upper(); - if (newStr == TQString::tqfromLatin1("-")) {// a special case + if (newStr == TQString::fromLatin1("-")) {// a special case if ((m_min || m_max) && m_min >= 0) ok = false; else diff --git a/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h index 867ef23d5..cf3eea505 100644 --- a/kexi/kexiutils/styleproxy.h +++ b/kexi/kexiutils/styleproxy.h @@ -67,10 +67,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle virtual void polishPopupMenu( TQPopupMenu* p ) { m_style->polishPopupMenu(p); } - virtual TQRect tqitemRect( TQPainter *p, const TQRect &r, + virtual TQRect itemRect( TQPainter *p, const TQRect &r, int flags, bool enabled, const TQPixmap *pixmap, const TQString &text, int len = -1 ) const { - return m_style->tqitemRect( p, r, flags, enabled, pixmap, text, len ); + return m_style->itemRect( p, r, flags, enabled, pixmap, text, len ); } virtual void drawItem( TQPainter *p, const TQRect &r, @@ -87,18 +87,18 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle m_style->tqdrawPrimitive( pe, p, r, cg, flags, option ); } - virtual void tqdrawControl( TQ_ControlElement element, + virtual void drawControl( TQ_ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const { - m_style->tqdrawControl( element, p, widget, r, cg, how, option ); + m_style->drawControl( element, p, widget, r, cg, how, option ); } - virtual void tqdrawControlMask( TQ_ControlElement element, + virtual void drawControlMask( TQ_ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& option = TQStyleOption::Default ) const { - m_style->tqdrawControlMask( element, p, widget, r, option ); + m_style->drawControlMask( element, p, widget, r, option ); } virtual TQRect subRect( SubRect r, const TQWidget *widget ) const @@ -106,7 +106,7 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle return m_style->subRect( r, widget ); } - virtual void tqdrawComplexControl( TQ_ComplexControl control, + virtual void drawComplexControl( TQ_ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags how = Style_Default, #ifdef TQ_TQDOC @@ -116,14 +116,14 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle #endif SCFlags subActive = SC_None, const TQStyleOption& option = TQStyleOption::Default ) const { - tqdrawComplexControl( control, p, widget, r, cg, how, sub, subActive, option ); + drawComplexControl( control, p, widget, r, cg, how, sub, subActive, option ); } - virtual void tqdrawComplexControlMask( TQ_ComplexControl control, + virtual void drawComplexControlMask( TQ_ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& option = TQStyleOption::Default ) const { - m_style->tqdrawComplexControlMask( control, p, widget, r, option ); + m_style->drawComplexControlMask( control, p, widget, r, option ); } virtual TQRect querySubControlMetrics( TQ_ComplexControl control, @@ -140,10 +140,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle return m_style->querySubControl( control, widget, pos, option ); } - virtual int tqpixelMetric( PixelMetric metric, + virtual int pixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const { - return m_style->tqpixelMetric( metric, widget ); + return m_style->pixelMetric( metric, widget ); } virtual TQSize tqsizeFromContents( ContentsType contents, @@ -153,11 +153,11 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle return m_style->tqsizeFromContents( contents, widget, contentsSize, option ); } - virtual int tqstyleHint( TQ_StyleHint stylehint, + virtual int styleHint( TQ_StyleHint stylehint, const TQWidget *widget = 0, const TQStyleOption& option = TQStyleOption::Default, TQStyleHintReturn* returnData = 0 ) const { - return m_style->tqstyleHint( stylehint, widget, option, returnData ); + return m_style->styleHint( stylehint, widget, option, returnData ); } virtual TQPixmap stylePixmap( StylePixmap stylepixmap, diff --git a/kexi/kexiutils/tristate.h b/kexi/kexiutils/tristate.h index 0a8df95c8..f38648498 100644 --- a/kexi/kexiutils/tristate.h +++ b/kexi/kexiutils/tristate.h @@ -165,8 +165,8 @@ public: */ TQString toString() const { if (m_value==False) - return TQString::tqfromLatin1("false"); - return m_value==True ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("cancelled"); + return TQString::fromLatin1("false"); + return m_value==True ? TQString::fromLatin1("true") : TQString::fromLatin1("cancelled"); } private: diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp index 7a1ab0f7a..729312dec 100644 --- a/kexi/kexiutils/utils.cpp +++ b/kexi/kexiutils/utils.cpp @@ -339,8 +339,8 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, bitBlt( p.device(), // pos.x(), // pos.y(), - (int)p.tqworldMatrix().dx() + rect.x() + lineWidth + pos.x(), - (int)p.tqworldMatrix().dy() + rect.y() + lineWidth + pos.y(), + (int)p.worldMatrix().dx() + rect.x() + lineWidth + pos.x(), + (int)p.worldMatrix().dy() + rect.y() + lineWidth + pos.y(), &pixmapBuffer); } } diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui index 8ffc254d3..133570e71 100644 --- a/kexi/main/kexifinddialogbase.ui +++ b/kexi/main/kexifinddialogbase.ui @@ -150,7 +150,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 5594d5779..293271c5c 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -245,8 +245,8 @@ KexiMainWindowImpl::KexiMainWindowImpl() int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); d->config->setGroup("MainWindow"); - TQSize s ( d->config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ), - d->config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) ); + TQSize s ( d->config->readNumEntry( TQString::fromLatin1("Width %1").tqarg(desk.width()), 700 ), + d->config->readNumEntry( TQString::fromLatin1("Height %1").tqarg(desk.height()), 480 ) ); resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } @@ -1836,7 +1836,7 @@ void KexiMainWindowImpl::initPropertyEditor() //1 dw->setMinimumWidth(200); - // ds->setSeparatorPos(d->propEditor->tqsizeHint().width(), true); + // ds->setSeparatorPos(d->propEditor->sizeHint().width(), true); //heh, this is for IDEAl only, I suppose? //js if (m_rightContainer) { @@ -1885,10 +1885,10 @@ void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized) if (tqchildrenMaximized && view) { setCaption( d->curDialog->caption() - + (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::tqfromLatin1(" - ") + d->appCaptionPrefix)) ); + + (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::fromLatin1(" - ") + d->appCaptionPrefix)) ); } else { - setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::tqfromLatin1(" - "))) + setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::fromLatin1(" - "))) + d->origAppCaption ); } } @@ -2093,8 +2093,8 @@ KexiMainWindowImpl::restoreSettings() }*/ config->setGroup("MainWindow"); - TQSize s ( config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ), - config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) ); + TQSize s ( config->readNumEntry( TQString::fromLatin1("Width %1").tqarg(desk.width()), 700 ), + config->readNumEntry( TQString::fromLatin1("Height %1").tqarg(desk.height()), 480 ) ); resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } #endif @@ -3479,8 +3479,8 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) KexiVDebug << (focus_w ? focus_w->name() : "" ) << endl; KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl; #ifdef KEXI_STATUSBAR_DEBUG - TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0; - d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") + TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0; + d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") .tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "") .tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "") ); @@ -3492,8 +3492,8 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) KexiVDebug << (focus_w ? focus_w->name() : "" ) << endl; KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl; #ifdef KEXI_STATUSBAR_DEBUG - TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0; - d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") + TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0; + d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") .tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "") .tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "") ); @@ -3512,7 +3512,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) // invalidateSharedActions(); } else { -/* TQObject* o = tqfocusWidget(); +/* TQObject* o = focusWidget(); while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase")) o = o->parent();*/ //js invalidateSharedActions(focus_w); @@ -4409,7 +4409,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio if (dlg) { // accept row changes - TQWidget *prevFocusWidget = tqfocusWidget(); + TQWidget *prevFocusWidget = focusWidget(); dlg->setFocus(); d->action_data_save_row->activate(); if (prevFocusWidget) diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index 9dbedae33..5f3d887a9 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -296,7 +296,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI virtual bool acceptsSharedActions(TQObject *w); /*! Performs lookup like in KexiSharedActionHost::focusWindow() - but starting from \a w instead of a widget returned by TQWidget::tqfocusWidget(). + but starting from \a w instead of a widget returned by TQWidget::focusWidget(). \return NULL if no widget matches acceptsSharedActions() or if \a w is NULL. */ TQWidget* findWindow(TQWidget *w); diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index c79b58dbb..98600c623 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -267,7 +267,7 @@ void updatePropEditorDockWidthInfo() { #endif } else { //propEditorToolWindow->show(); - TQWidget *origFocusWidget = tqApp->tqfocusWidget(); + TQWidget *origFocusWidget = tqApp->focusWidget(); wnd->makeWidgetDockVisible(propEditorTabWidget); if (origFocusWidget) origFocusWidget->setFocus(); diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp index 45cbc4497..f3e1acec2 100644 --- a/kexi/main/kexinamedialog.cpp +++ b/kexi/main/kexinamedialog.cpp @@ -53,12 +53,12 @@ void KexiNameDialog::init() { TQGridLayout *lyr = new TQGridLayout(plainPage(), 2, 3); m_icon = new TQLabel( plainPage(), "icon" ); - m_icon->tqsetAlignment( int( AlignTop | AlignLeft ) ); - m_icon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0)); + m_icon->setAlignment( int( AlignTop | AlignLeft ) ); + m_icon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0)); m_icon->setFixedWidth(50); lyr->addWidget(m_icon,0,0); - m_widget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0)); + m_widget->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0)); lyr->addWidget(m_widget,0,1); lyr->addItem(new TQSpacerItem( 25, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 0, 2); lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1); @@ -75,7 +75,7 @@ void KexiNameDialog::updateSize() { // resize( TQSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) ) resize( TQSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) ) - .expandedTo(tqminimumSizeHint()) ); + .expandedTo(minimumSizeHint()) ); // updateGeometry(); } diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp index c6ca8f417..8f5ee38a8 100644 --- a/kexi/main/kexinamewidget.cpp +++ b/kexi/main/kexinamewidget.cpp @@ -66,8 +66,8 @@ void KexiNameWidget::init( lbl_message = new TQLabel( this, "message" ); setMessageText( message ); - lbl_message->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); - lbl_message->tqsetAlignment( TQLabel::AlignTop | TQLabel::WordBreak ); + lbl_message->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + lbl_message->setAlignment( TQLabel::AlignTop | TQLabel::WordBreak ); lyr->addMultiCellWidget( lbl_message, 0, 0, 0, 1 ); lbl_caption = new TQLabel( captionLabel.isEmpty() ? i18n( "Caption:" ) : captionLabel, @@ -79,17 +79,17 @@ void KexiNameWidget::init( lyr->addWidget( lbl_name, 2, 0 ); le_caption = new KLineEdit( nameText, this, "le_caption" ); - le_caption->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0)); + le_caption->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0)); lyr->addWidget( le_caption, 1, 1 ); le_name = new KLineEdit( nameText, this, "le_name" ); - le_name->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0)); + le_name->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0)); Validator *idValidator = new IdentifierValidator(0, "id_val"); le_name->setValidator( m_validator = new MultiValidator(idValidator, TQT_TQOBJECT(this), "val") ); lyr->addWidget( le_name, 2, 1 ); setFocusProxy(le_caption); - resize( TQSize(342, 123).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(342, 123).expandedTo(minimumSizeHint()) ); m_nameWarning = i18n("Please enter the name."); m_captionWarning = i18n("Please enter the caption."); diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index e4bfd5801..439c20b62 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -78,7 +78,7 @@ void KexiStatusBar::activePartChanged(KParts::Part *part) if (part && part->widget()) { if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( settqStatus( const TQString & ) ) ); + this, TQT_SLOT( setStatus( const TQString & ) ) ); # if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) changeItem(m_map[ m_activePart ], m_msgID); @@ -110,7 +110,7 @@ void KexiStatusBar::cursorPositionChanged() #endif } -void KexiStatusBar::settqStatus(const TQString &str) +void KexiStatusBar::setStatus(const TQString &str) { kdDebug() << "KexiStatusBar::setStatus(" << str << ")" << endl; // m_status->setText(str); @@ -133,8 +133,8 @@ void KexiStatusBar::setCursorPosition(int line, int col) { KStatusBar::addWidget(widget,stretch,permanent); - if(widget->tqsizeHint().height() + 4 > height()) - setFixedHeight(widget->tqsizeHint().height() + 4); + if(widget->sizeHint().height() + 4 > height()) + setFixedHeight(widget->sizeHint().height() + 4); }*/ void KexiStatusBar::setReadOnlyFlag(bool readOnly) diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h index bab1277a5..e8c31d41a 100644 --- a/kexi/main/kexistatusbar.h +++ b/kexi/main/kexistatusbar.h @@ -48,7 +48,7 @@ class KexiStatusBar : public KStatusBar // virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false); public slots: - virtual void settqStatus(const TQString &str); + virtual void setStatus(const TQString &str); virtual void setReadOnlyFlag(bool readOnly); protected slots: @@ -58,7 +58,7 @@ class KexiStatusBar : public KStatusBar protected: int m_msgID, m_readOnlyID; -// TQLabel *m_status, *m_readOnlytqStatus; +// TQLabel *m_status, *m_readOnlyStatus; #if KexiStatusBar_KTEXTEDITOR_USED KTextEditor::ViewCursorInterface * m_cursorIface; diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index 45ab58929..ac829ce1a 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -278,7 +278,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo } painter.setFont(m_mainFont); - m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(), + m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true, false); m_dateTimeWidth = painter.fontMetrics().width(m_dateTimeText+" "); m_mainLineSpacing = painter.fontMetrics().lineSpacing(); diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui index 6b169f7ec..de57e97e9 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui +++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>6</height> @@ -343,7 +343,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -360,7 +360,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> @@ -377,7 +377,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> @@ -394,7 +394,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> @@ -411,7 +411,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index 68c1c6735..f07722d80 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -196,11 +196,11 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( m_scrollView = new KexiSimplePrintPreviewScrollView(this); m_scrollView->setUpdatesEnabled(false); m_view = m_scrollView->widget; - m_scrollView->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + m_scrollView->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); lyr->addWidget(m_scrollView); TQWidget* navToolbarWidget = new TQWidget(this); //widget used to center the navigator toolbar - navToolbarWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + navToolbarWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget); lyr->addWidget(navToolbarWidget); diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui index 5c7bb64dd..4c371ed25 100644 --- a/kexi/main/startup/KexiConnSelectorBase.ui +++ b/kexi/main/startup/KexiConnSelectorBase.ui @@ -72,7 +72,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>60</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -177,7 +177,7 @@ <property name="name"> <cstring>descGroupBox</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -205,7 +205,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>50</height> diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui index 7b711ea30..e8a00ef9a 100644 --- a/kexi/main/startup/KexiDBTitlePageBase.ui +++ b/kexi/main/startup/KexiDBTitlePageBase.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>111</height> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -76,7 +76,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui index 79f763ee6..29e52812b 100644 --- a/kexi/main/startup/KexiNewPrjTypeSelector.ui +++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index b24a66abf..625af34f7 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -96,7 +96,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, //page: type selector m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector"); // lv_types = new KListView(m_prjtype_sel, "types listview"); -// m_prjtype_sel->lv_types->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2)); +// m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2)); #if KDE_IS_VERSION(3,3,9) m_prjtype_sel->lv_types->setShadeSortColumn(false); #endif @@ -142,7 +142,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_conn_sel_widget = new TQWidget(this); TQVBoxLayout* conn_sel_lyr = new TQVBoxLayout(m_conn_sel_widget); TQLabel *conn_sel_label = new TQLabel(i18n("Enter a new Kexi project's file name:"), m_conn_sel_widget); - conn_sel_label->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + conn_sel_label->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); conn_sel_lyr->addWidget( conn_sel_label ); conn_sel_lyr->addSpacing(KDialogBase::spacingHint()); diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui index f11d7f581..b822f0ff2 100644 --- a/kexi/main/startup/KexiOpenExistingFile.ui +++ b/kexi/main/startup/KexiOpenExistingFile.ui @@ -43,7 +43,7 @@ <property name="name"> <cstring>line</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>8</height> @@ -60,13 +60,13 @@ <property name="name"> <cstring>spacer</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>6</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>6</height> diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui index 18c805441..57aa28adc 100644 --- a/kexi/main/startup/KexiProjectSelectorBase.ui +++ b/kexi/main/startup/KexiProjectSelectorBase.ui @@ -103,7 +103,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>60</height> diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui index b423d467a..f482ed736 100644 --- a/kexi/main/startup/KexiServerDBNamePage.ui +++ b/kexi/main/startup/KexiServerDBNamePage.ui @@ -44,7 +44,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -55,7 +55,7 @@ <property name="name"> <cstring>le_dbname</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>12</height> diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index c479a4e08..1708efbce 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -126,7 +126,7 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen) if (ok && percent>=0 && percent<=100 && pd->progressBar()->progress()<percent) { // kdDebug() << percent << endl; pd->progressBar()->setProgress(percent); - tqApp->tqprocessEvents(100); + tqApp->processEvents(100); } } } @@ -176,7 +176,7 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog() void KexiDBPasswordDialog::done(int r) { if (r == TQDialog::Accepted) { - m_cdata->password = TQString::tqfromLatin1(password()); + m_cdata->password = TQString::fromLatin1(password()); } // if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) { /* } else { @@ -364,7 +364,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) const bool dropDB = args->isSet("dropdb"); const bool openExisting = !createDB && !dropDB; const bool readOnly = args->isSet("readonly"); - const TQString couldnotMsg = TQString::tqfromLatin1("\n") + const TQString couldnotMsg = TQString::fromLatin1("\n") +i18n("Could not start Kexi application this way."); if (createDB && dropDB) { @@ -872,19 +872,19 @@ tristate KexiStartupHandler::detectActionForFile( if (detectedDriverName.isEmpty()) { TQString possibleProblemsInfoMsg( Kexi::driverManager().possibleProblemsInfoMsg() ); if (!possibleProblemsInfoMsg.isEmpty()) { - possibleProblemsInfoMsg.prepend(TQString::tqfromLatin1("<p>")+i18n("Possible problems:")); - possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>"); + possibleProblemsInfoMsg.prepend(TQString::fromLatin1("<p>")+i18n("Possible problems:")); + possibleProblemsInfoMsg += TQString::fromLatin1("</p>"); } if (!(options & SkipMessages)) KMessageBox::detailedSorry(parent, i18n( "The file \"%1\" is not recognized as being supported by Kexi.") .tqarg(TQDir::convertSeparators(dbFileName)), - TQString::tqfromLatin1("<p>") + TQString::fromLatin1("<p>") +i18n("Database driver for this file type not found.\nDetected MIME type: %1") .tqarg(mimename) +(ptr.data()->comment().isEmpty() - ? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment())) - +TQString::tqfromLatin1("</p>") + ? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").tqarg(ptr.data()->comment())) + +TQString::fromLatin1("</p>") +possibleProblemsInfoMsg); return false; } @@ -894,7 +894,7 @@ tristate KexiStartupHandler::detectActionForFile( KexiProjectData* KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent) { - cleartqStatus(); + clearStatus(); cancelled = false; if (!cdata) return 0; @@ -922,7 +922,7 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled msgh.showErrorMessage( i18n("Could not load list of available projects for <b>%1</b> database server.") .tqarg(cdata->serverInfoString(true))); -// settqStatus(i18n("Could not load list of available projects for database server \"%1\"") +// setStatus(i18n("Could not load list of available projects for database server \"%1\"") // .tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); return 0; } diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h index fe1b3cf04..23d8e832a 100644 --- a/kexi/main/startup/KexiStartup.h +++ b/kexi/main/startup/KexiStartup.h @@ -59,7 +59,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog /*! Handles startup actions for Kexi application. */ class KEXIMAIN_EXPORT KexiStartupHandler - : public TQObject, public KexiStartupData, public Kexi::ObjecttqStatus + : public TQObject, public KexiStartupData, public Kexi::ObjectStatus { Q_OBJECT TQ_OBJECT diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 7f67bc767..91bd6bfcf 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -324,7 +324,7 @@ void KexiStartupDialog::setupPageTemplates() tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); TQLabel *lbl_blank = new TQLabel( i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame ); - lbl_blank->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + lbl_blank->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_blank->setMargin(0); tmplyr->addWidget( lbl_blank ); tmplyr->addStretch(1); @@ -342,7 +342,7 @@ void KexiStartupDialog::setupPageTemplates() TQLabel *lbl_templ = new TQLabel( i18n("Kexi will create a new database project using selected template.\n" "Select template and click \"OK\" button to proceed."), templPageFrame ); - lbl_templ->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + lbl_templ->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_templ->setMargin(0); tmplyr->addWidget( lbl_templ ); @@ -389,7 +389,7 @@ void KexiStartupDialog::setupPageTemplates() TQLabel *lbl_import = new TQLabel( i18n("Kexi will import the structure and data of an existing database as a new database project.") +clickMsg, templPageFrame ); - lbl_import->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + lbl_import->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_import->setMargin(0); tmplyr->addWidget( lbl_import ); tmplyr->addStretch(1); diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index cd54602bf..1e50a12de 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -42,7 +42,7 @@ KexiStartupFileDialog::KexiStartupFileDialog( , m_confirmOverwrites(true) , m_filtersUpdated(false) { - tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum); + setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum); setMode( mode ); TQPoint point( 0, 0 ); diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index c81de131c..67a44ca6d 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -197,7 +197,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new directory.")); d->bookmarkHandler = new KFileBookmarkHandler( this ); - toolbar->insertButton(TQString::tqfromLatin1("bookmark"), + toolbar->insertButton(TQString::fromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, i18n("Bookmarks")); toolbar->getButton(HOTLIST_BUTTON)->setPopup( d->bookmarkHandler->menu(), @@ -441,7 +441,7 @@ void KexiStartupFileDialogBase::setMimeFilter( const TQStringList& mimeTypes, //(js) filterWidget->setMimeFilter( mimeTypes, defaultType ); //(js) TQStringList types = TQStringList::split(" ", filterWidget->currentFilter()); -//(js) types.append( TQString::tqfromLatin1( "inode/directory" )); +//(js) types.append( TQString::fromLatin1( "inode/directory" )); //(js) ops->clearFilter(); //(js) ops->setMimeFilter( types ); //(js) d->hasDefaultFilter = !defaultType.isEmpty(); diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp index 50d6726d0..e89d0932f 100644 --- a/kexi/migration/importoptionsdlg.cpp +++ b/kexi/migration/importoptionsdlg.cpp @@ -53,7 +53,7 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele KDialogBase::spacingHint()); m_encodingComboBox = new KexiCharacterEncodingComboBox(plainPage(), selectedEncoding); - m_encodingComboBox->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + m_encodingComboBox->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); lyr->addWidget( m_encodingComboBox, 1, 1 ); TQLabel* lbl = new TQLabel( i18n("<h3>Text encoding for Microsoft Access database</h3>\n" @@ -61,8 +61,8 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele "<p>In order to properly import national characters, you may need to choose a proper text encoding " "if the database was created on a computer with a different character set.</p>") .tqarg(TQDir::convertSeparators(databaseFile)), plainPage()); - lbl->tqsetAlignment( TQt::AlignAuto | TQt::WordBreak ); - lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + lbl->setAlignment( TQt::AlignAuto | TQt::WordBreak ); + lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); lyr->addMultiCellWidget( lbl, 0, 0, 0, 2 ); TQLabel* lbl2 = new TQLabel( m_encodingComboBox, i18n("Text encoding:"), plainPage()); diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index 9c1b45598..91de5f7f8 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -110,7 +110,7 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args) } } - m_sourceDBEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); //default + m_sourceDBEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); //default } //=========================================================== @@ -148,7 +148,7 @@ void ImportWizard::setupIntro() TQVBoxLayout *vbox = new TQVBoxLayout(m_introPage, KDialog::marginHint()); TQLabel *lblIntro = new TQLabel(m_introPage); - lblIntro->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); + lblIntro->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); TQString msg; if (m_predefinedConnectionData) { //predefined import: server source msg = i18n("<qt>Database Importing wizard is about to import \"%1\" database " @@ -247,7 +247,7 @@ void ImportWizard::setupDstType() TQHBoxLayout *hbox = new TQHBoxLayout(vbox); TQLabel *lbl = new TQLabel(i18n("Destination database type:")+" ", m_dstTypePage); - lbl->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop); + lbl->setAlignment(TQt::AlignAuto|TQt::AlignTop); hbox->addWidget(lbl); m_dstPrjTypeSelector = new KexiPrjTypeSelector(m_dstTypePage); @@ -339,10 +339,10 @@ void ImportWizard::setupImporting() m_importingPage->hide(); TQVBoxLayout *vbox = new TQVBoxLayout(m_importingPage, KDialog::marginHint()); m_lblImportingTxt = new TQLabel(m_importingPage); - m_lblImportingTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); + m_lblImportingTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); m_lblImportingErrTxt = new TQLabel(m_importingPage); - m_lblImportingErrTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); + m_lblImportingErrTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); m_progressBar = new KProgress(100, m_importingPage); m_progressBar->hide(); @@ -374,7 +374,7 @@ void ImportWizard::setupFinish() m_finishPage->hide(); TQVBoxLayout *vbox = new TQVBoxLayout(m_finishPage, KDialog::marginHint()); m_finishLbl = new TQLabel(m_finishPage); - m_finishLbl->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); + m_finishLbl->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); vbox->addWidget( m_finishLbl ); m_openImportedProjectCheckBox = new TQCheckBox(i18n("Open imported project"), @@ -398,7 +398,7 @@ bool ImportWizard::checkUserInput() finishtxt = finishtxt + "<br>" + i18n("No new database name was entered."); } - Kexi::ObjecttqStatus result; + Kexi::ObjectStatus result; KexiMigrate* sourceDriver = prepareImport(result); if (sourceDriver && sourceDriver->isSourceAndDestinationDataSourceTheSame()) { @@ -551,7 +551,7 @@ void ImportWizard::arriveImportingPage() { //! and KexiMigration::Driver classes bool showOptions = false; if (fileBasedSrcSelected()) { - Kexi::ObjecttqStatus result; + Kexi::ObjectStatus result; KexiMigrate* sourceDriver = prepareImport(result); if (sourceDriver) { showOptions = !result.error() @@ -650,7 +650,7 @@ void ImportWizard::accept() KWizard::accept(); } -KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) +KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result) { KexiUtils::WaitCursor wait; @@ -667,10 +667,10 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) ); if (!destDriver || manager.error()) { - result.settqStatus(&manager); + result.setStatus(&manager); kdDebug() << "Manager error..." << endl; manager.debugError(); -// result.settqStatus(&manager); +// result.setStatus(&manager); } // Set up destination connection data @@ -702,7 +702,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) { //TODO This needs a better message //KMessageBox::error(this, - result.settqStatus(i18n("No connection data is available. You did not select a destination filename."),""); + result.setStatus(i18n("No connection data is available. You did not select a destination filename."),""); //return false; } */ } @@ -713,7 +713,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) { sourceDriverName = driverNameForSelectedSource(); if (sourceDriverName.isEmpty()) - result.settqStatus(i18n("No appropriate migration driver found."), + result.setStatus(i18n("No appropriate migration driver found."), m_migrateManager.possibleProblemsInfoMsg()); } @@ -724,7 +724,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) sourceDriver = m_migrateManager.driver( sourceDriverName ); if(!sourceDriver || m_migrateManager.error()) { kdDebug() << "Import migrate driver error..." << endl; - result.settqStatus(&m_migrateManager); + result.setStatus(&m_migrateManager); } } @@ -793,7 +793,7 @@ tristate ImportWizard::import() { m_importExecuted = true; - Kexi::ObjecttqStatus result; + Kexi::ObjectStatus result; KexiMigrate* sourceDriver = prepareImport(result); bool acceptingNeeded = false; diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h index 8d3a82b02..19a1b844c 100644 --- a/kexi/migration/importwizard.h +++ b/kexi/migration/importwizard.h @@ -47,7 +47,7 @@ class KexiPrjTypeSelector; namespace Kexi { - class ObjecttqStatus; + class ObjectStatus; } namespace KexiDB @@ -98,7 +98,7 @@ private: void setupImporting(); bool checkUserInput(); - KexiMigrate* prepareImport(Kexi::ObjecttqStatus& result); + KexiMigrate* prepareImport(Kexi::ObjectStatus& result); /*! Performs import. \return true/false on success/faulure or cancelled when user cancelled importing (mainly diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp index b225f6ba1..7b4944f25 100644 --- a/kexi/migration/keximigrate.cpp +++ b/kexi/migration/keximigrate.cpp @@ -61,18 +61,18 @@ KexiMigrate::~KexiMigrate() delete m_destPrj; } -bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result, +bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result, bool& acceptingNeeded) { acceptingNeeded = false; if (result) - result->cleartqStatus(); + result->clearStatus(); KexiDB::DriverManager drvManager; KexiDB::Driver *destDriver = drvManager.driver( m_migrateData->destination->connectionData()->driverName); if (!destDriver) { - result->settqStatus(&drvManager, + result->setStatus(&drvManager, i18n("Could not create database \"%1\".") .tqarg(m_migrateData->destination->databaseName())); return false; @@ -113,16 +113,16 @@ bool KexiMigrate::isSourceAndDestinationDataSourceTheSame() const //============================================================================= // Perform Import operation -bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) +bool KexiMigrate::performImport(Kexi::ObjectStatus* result) { if (result) - result->cleartqStatus(); + result->clearStatus(); KexiDB::DriverManager drvManager; KexiDB::Driver *destDriver = drvManager.driver( m_migrateData->destination->connectionData()->driverName); if (!destDriver) { - result->settqStatus(&drvManager, + result->setStatus(&drvManager, i18n("Could not create database \"%1\".") .tqarg(m_migrateData->destination->databaseName())); return false; @@ -135,7 +135,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (!drv_connect()) { kdDebug() << "Couldnt connect to database server" << endl; if (result) - result->settqStatus(i18n("Could not connect to data source \"%1\".") + result->setStatus(i18n("Could not connect to data source \"%1\".") .tqarg(m_migrateData->source->serverInfoString()), ""); return false; } @@ -145,7 +145,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (!tableNames(tables)) { kdDebug() << "Couldnt get list of tables" << endl; if (result) - result->settqStatus( + result->setStatus( i18n("Could not get a list of table names for data source \"%1\".") .tqarg(m_migrateData->source->serverInfoString()), ""); return false; @@ -155,7 +155,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (tables.isEmpty()) { kdDebug() << "There were no tables to import" << endl; if (result) - result->settqStatus( + result->setStatus( i18n("No tables to import found in data source \"%1\".") .tqarg(m_migrateData->source->serverInfoString()), ""); return false; @@ -165,14 +165,14 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) tables.sort(); m_tableSchemas.clear(); if (!destDriver) { - result->settqStatus(&drvManager); + result->setStatus(&drvManager); return false; } const bool kexi__objects_exists = tables.find("kexi__objects")!=tables.end(); TQStringList kexiDBTables; if (kexi__objects_exists) { tristate res = drv_queryStringListFromSQL( - TQString::tqfromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1") + TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1") .tqarg((int)KexiDB::TableObjectType), 0, kexiDBTables, -1); if (res == true) { // prepend KexiDB-compatible tables to 'tables' list, so we'll copy KexiDB-compatible tables first, @@ -199,7 +199,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (!drv_readTableSchema(*it, *tableSchema)) { delete tableSchema; if (result) - result->settqStatus( + result->setStatus( i18n("Could not import project from data source \"%1\". Error reading table \"%2\".") .tqarg(m_migrateData->source->serverInfoString()).tqarg(tableName), ""); return false; @@ -228,7 +228,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (trans.isNull()) { ok = false; if (result) - result->settqStatus(destConn, + result->setStatus(destConn, i18n("Could not create database \"%1\".") .tqarg(m_migrateData->destination->databaseName())); //later destConn->dropDatabase(m_migrateData->destination->databaseName()); @@ -258,7 +258,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) //load schema for every field and add it firstRecord = true; TQString sql( - TQString::tqfromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, " + TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, " "f_options, f_default, f_order, f_caption, f_help" " FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->id()) ); while (ok) { @@ -299,7 +299,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) kdDebug() << "Failed to create a table " << ts->name() << endl; destConn->debugError(); if (result) - result->settqStatus(destConn, + result->setStatus(destConn, i18n("Could not create database \"%1\".") .tqarg(m_migrateData->destination->databaseName())); m_tableSchemas.remove(ts); @@ -329,7 +329,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (m_destPrj->error()) { ok = false; if (result) - result->settqStatus(m_destPrj, + result->setStatus(m_destPrj, i18n("Could not import project from data source \"%1\".") .tqarg(m_migrateData->source->serverInfoString())); } @@ -380,7 +380,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (!ok) { kdDebug() << "Failed to copy table " << tname << endl; if (result) - result->settqStatus(destConn, + result->setStatus(destConn, i18n("Could not copy table \"%1\" to destination database.").tqarg(tname)); break; } @@ -404,7 +404,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) // Finally: error handling if (result && result->error()) - result->settqStatus(destConn, + result->setStatus(destConn, i18n("Could not import data from data source \"%1\".") .tqarg(m_migrateData->source->serverInfoString())); if (destConn) { @@ -420,10 +420,10 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) } //============================================================================= -bool KexiMigrate::performExport(Kexi::ObjecttqStatus* result) +bool KexiMigrate::performExport(Kexi::ObjectStatus* result) { if (result) - result->cleartqStatus(); + result->clearStatus(); //! @todo performExport @@ -588,7 +588,7 @@ bool KexiMigrate::drv_queryMaxNumber(const TQString& tableName, { TQString string; tristate r = drv_querySingleStringFromSQL( - TQString::tqfromLatin1("SELECT MAX(%1) FROM %2").tqarg(drv_escapeIdentifier(columnName)) + TQString::fromLatin1("SELECT MAX(%1) FROM %2").tqarg(drv_escapeIdentifier(columnName)) .tqarg(drv_escapeIdentifier(tableName)), 0, string); if (r == false) return false; diff --git a/kexi/migration/keximigrate.h b/kexi/migration/keximigrate.h index ee22ded85..cd2949f9d 100644 --- a/kexi/migration/keximigrate.h +++ b/kexi/migration/keximigrate.h @@ -34,7 +34,7 @@ class KexiProject; namespace Kexi { - class ObjecttqStatus; + class ObjectStatus; } /*! KexiMigration implementation version. @@ -99,7 +99,7 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object \a acceptingNeeded is set to true if destination database exists. In this case you should ask about accepting database overwriting. Used in ImportWizard::import(). */ - bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result, + bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result, bool& acceptingNeeded); /*! Checks if the source- and the destination databases are identical. @@ -107,10 +107,10 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object bool isSourceAndDestinationDataSourceTheSame() const; //! Perform an import operation - bool performImport(Kexi::ObjecttqStatus* result = 0); + bool performImport(Kexi::ObjectStatus* result = 0); //! Perform an export operation - bool performExport(Kexi::ObjecttqStatus* result = 0); + bool performExport(Kexi::ObjectStatus* result = 0); //! Returns true if the migration driver supports progress updates. inline bool progressSupported() { return drv_progressSupported(); } diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 2c0ce6cdb..d46b9e4df 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -363,7 +363,7 @@ TQString MigrateManager::possibleProblemsInfoMsg() const for (TQStringList::ConstIterator it = d_int->possibleProblems.constBegin(); it!=d_int->possibleProblems.constEnd(); ++it) { - str += (TQString::tqfromLatin1("<li>") + *it + TQString::tqfromLatin1("</li>")); + str += (TQString::fromLatin1("<li>") + *it + TQString::fromLatin1("</li>")); } str += "</ul>"; return str; diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp index 1b125d8dc..786712412 100644 --- a/kexi/migration/mysql/mysqlmigrate.cpp +++ b/kexi/migration/mysql/mysqlmigrate.cpp @@ -396,7 +396,7 @@ KexiDB::Field::Type MySQLMigrate::examineBlobField(const TQString& table, TQString mysqlType; KexiDB::Field::Type kexiType; TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) + - "` LIKE '" + TQString::tqfromLatin1(fld->name) + "'"; + "` LIKE '" + TQString::fromLatin1(fld->name) + "'"; if(d->executeSQL(query)) { MYSQL_RES *res = mysql_store_result(d->mysql); @@ -444,7 +444,7 @@ TQStringList MySQLMigrate::examineEnumField(const TQString& table, const MYSQL_FIELD* fld) { TQString vals; TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) + - "` LIKE '" + TQString::tqfromLatin1(fld->name) + "'"; + "` LIKE '" + TQString::fromLatin1(fld->name) + "'"; if(d->executeSQL(query)) { MYSQL_RES *res = mysql_store_result(d->mysql); diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp index d6c655f98..b7f043514 100644 --- a/kexi/migration/pqxx/pqxxmigrate.cpp +++ b/kexi/migration/pqxx/pqxxmigrate.cpp @@ -135,7 +135,7 @@ bool PqxxMigrate::drv_tableNames(TQStringList& tableNames) for (pqxx::result::const_iterator c = m_res->begin(); c != m_res->end(); ++c) { // Copy the result into the return list - tableNames << TQString::tqfromLatin1 (c[0].c_str()); + tableNames << TQString::fromLatin1 (c[0].c_str()); } return true; } @@ -217,15 +217,15 @@ bool PqxxMigrate::drv_connect() if (m_migrateData->source->port == 0) m_migrateData->source->port = 5432; - conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(m_migrateData->source->port); + conninfo += TQString::fromLatin1(" port='%1'").tqarg(m_migrateData->source->port); - conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(m_migrateData->sourceName); + conninfo += TQString::fromLatin1(" dbname='%1'").tqarg(m_migrateData->sourceName); if (!m_migrateData->source->userName.isNull()) - conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(m_migrateData->source->userName); + conninfo += TQString::fromLatin1(" user='%1'").tqarg(m_migrateData->source->userName); if (!m_migrateData->source->password.isNull()) - conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(m_migrateData->source->password); + conninfo += TQString::fromLatin1(" password='%1'").tqarg(m_migrateData->source->password); try { @@ -480,7 +480,7 @@ tristate PqxxMigrate::drv_queryStringListFromSQL( mysql_free_result(res); return false; } - string = TQString::tqfromLatin1(row[columnNumber], lengths[columnNumber]); + string = TQString::fromLatin1(row[columnNumber], lengths[columnNumber]); mysql_free_result(res); } else { kdDebug() << "PqxxMigrate::drv_querySingleStringFromSQL(): null result" << endl; @@ -647,7 +647,7 @@ bool PqxxMigrate::notEmpty(pqxx::oid /*table_uid*/, int /*col*/) const // Read value of column 0 into a string N c[0].to(N); // Copy the result into the return list - list << TQString::tqfromLatin1 (N.c_str()); + list << TQString::fromLatin1 (N.c_str()); KexiDBDrvDbg << N.c_str() << endl; } return true; diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index 615858407..921432b66 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -405,7 +405,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ setButtonOK( KGuiItem(i18n("Assign action", "&Assign"), "button_ok", i18n("Assign action")) ); TQWidget *mainWidget = new TQWidget( this ); - mainWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + mainWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); setMainWidget(mainWidget); /* lbl 1 @@ -428,24 +428,24 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ // 1st column: action types d->actionCategoriesListView = new ActionCategoriesListView(mainWidget); - d->actionCategoriesListView->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + d->actionCategoriesListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); d->glyr->addWidget(d->actionCategoriesListView, 1, 0); connect( d->actionCategoriesListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotActionCategorySelected(TQListViewItem*))); TQLabel *lbl = new TQLabel(d->actionCategoriesListView, i18n("Action category:"), mainWidget); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); - lbl->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + lbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); d->glyr->addWidget(lbl, 0, 0, TQt::AlignTop|TQt::AlignLeft); // widget stack for 2nd and 3rd column d->secondAnd3rdColumnStack = new TQWidgetStack(mainWidget); - d->secondAnd3rdColumnStack->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + d->secondAnd3rdColumnStack->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); d->glyr->addMultiCellWidget(d->secondAnd3rdColumnStack, 0, 1, 1, 1);//, TQt::AlignTop|TQt::AlignLeft); d->secondAnd3rdColumnMainWidget = new TQWidget(d->secondAnd3rdColumnStack); - d->secondAnd3rdColumnMainWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + d->secondAnd3rdColumnMainWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); d->secondAnd3rdColumnGrLyr = new TQGridLayout(d->secondAnd3rdColumnMainWidget, 2, 2, 0, KDialog::spacingHint()); d->secondAnd3rdColumnGrLyr->setRowStretch(1, 2); d->secondAnd3rdColumnStack->addWidget(d->secondAnd3rdColumnMainWidget); @@ -457,8 +457,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ this, TQT_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*))); d->selectActionToBeExecutedLbl = new TQLabel(d->secondAnd3rdColumnMainWidget); - d->selectActionToBeExecutedLbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); - d->selectActionToBeExecutedLbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + d->selectActionToBeExecutedLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->selectActionToBeExecutedLbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); d->selectActionToBeExecutedLbl->setMinimumHeight(d->selectActionToBeExecutedLbl->fontMetrics().height()*2); d->secondAnd3rdColumnGrLyr->addWidget(d->selectActionToBeExecutedLbl, 0, 0, TQt::AlignTop|TQt::AlignLeft); @@ -469,7 +469,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ d->actionToExecuteListView = new ActionToExecuteListView(d->secondAnd3rdColumnMainWidget); d->actionToExecuteListView->installEventFilter(this); //to be able to disable painting d->actionToExecuteListView->viewport()->installEventFilter(this); //to be able to disable painting - d->actionToExecuteListView->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + d->actionToExecuteListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); connect(d->actionToExecuteListView, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*))); connect(d->actionToExecuteListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), @@ -479,8 +479,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ d->actionToExecuteLbl = new TQLabel(d->actionToExecuteListView, i18n("Action to execute:"), d->secondAnd3rdColumnMainWidget); d->actionToExecuteLbl->installEventFilter(this); //to be able to disable painting - d->actionToExecuteLbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); - d->actionToExecuteLbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + d->actionToExecuteLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->actionToExecuteLbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteLbl, 0, 1, TQt::AlignTop|TQt::AlignLeft); // temporary show all sections to avoid resizing the dialog in the future @@ -538,7 +538,7 @@ void KexiActionSelectionDialog::slotKActionItemExecuted(TQListViewItem*) void KexiActionSelectionDialog::slotKActionItemSelected(TQListViewItem*) { d->setActionToExecuteSectionVisible(false); - updateOKButtontqStatus(); + updateOKButtonStatus(); } void KexiActionSelectionDialog::slotCurrentFormActionItemExecuted(TQListViewItem*) @@ -549,7 +549,7 @@ void KexiActionSelectionDialog::slotCurrentFormActionItemExecuted(TQListViewItem void KexiActionSelectionDialog::slotCurrentFormActionItemSelected(TQListViewItem*) { d->setActionToExecuteSectionVisible(false); - updateOKButtontqStatus(); + updateOKButtonStatus(); } void KexiActionSelectionDialog::slotItemForOpeningOrExecutingSelected(KexiPart::Item* item) @@ -568,7 +568,7 @@ void KexiActionSelectionDialog::slotActionToExecuteItemExecuted(TQListViewItem* void KexiActionSelectionDialog::slotActionToExecuteItemSelected(TQListViewItem*) { - updateOKButtontqStatus(); + updateOKButtonStatus(); } void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) @@ -583,13 +583,13 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) if (!d->kactionPageWidget) { //create lbl+list view with a vtqlayout d->kactionPageWidget = new TQWidget(); - d->kactionPageWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint()); d->kactionListView = new KActionsListView(d->kactionPageWidget, d->mainWin); d->kactionListView->init(); TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.tqarg(d->actionWidgetName), d->kactionPageWidget); - lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); vlyr->addWidget(lbl); vlyr->addWidget(d->kactionListView); @@ -607,14 +607,14 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) if (!d->currentFormActionsPageWidget) { //create lbl+list view with a vtqlayout d->currentFormActionsPageWidget = new TQWidget(); - d->currentFormActionsPageWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + d->currentFormActionsPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); TQVBoxLayout *vlyr = new TQVBoxLayout(d->currentFormActionsPageWidget, 0, KDialog::spacingHint()); d->currentFormActionsListView = new CurrentFormActionsListView( d->currentFormActionsPageWidget, d->mainWin); d->currentFormActionsListView->init(); TQLabel *lbl = new TQLabel(d->currentFormActionsListView, selectActionToBeExecutedMsg.tqarg(d->actionWidgetName), d->currentFormActionsPageWidget); - lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); vlyr->addWidget(lbl); vlyr->addWidget(d->currentFormActionsListView); @@ -635,7 +635,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) d->setActionToExecuteSectionVisible(false); } d->actionCategoriesListView->update(); - updateOKButtontqStatus(); + updateOKButtonStatus(); return; } // other case @@ -656,7 +656,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) d->raiseWidget( d->secondAnd3rdColumnMainWidget ); } d->actionCategoriesListView->update(); - updateOKButtontqStatus(); + updateOKButtonStatus(); } KexiMainWindow* KexiActionSelectionDialog::mainWin() const @@ -705,7 +705,7 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const return data; // No Action } -void KexiActionSelectionDialog::updateOKButtontqStatus() +void KexiActionSelectionDialog::updateOKButtonStatus() { TQPushButton *btn = actionButton(Ok); ActionSelectorDialogListItem *simpleItem = dynamic_cast<ActionSelectorDialogListItem*>( diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h index a2c4066d4..983ea759a 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.h +++ b/kexi/plugins/forms/kexiactionselectiondialog.h @@ -63,7 +63,7 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase void slotItemForOpeningOrExecutingSelected(KexiPart::Item* item); protected: - void updateOKButtontqStatus(); + void updateOKButtonStatus(); class KexiActionSelectionDialogPrivate; KexiActionSelectionDialogPrivate* d; diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index e89ba9cb7..8ae592d90 100644 --- a/kexi/plugins/forms/kexidataprovider.cpp +++ b/kexi/plugins/forms/kexidataprovider.cpp @@ -228,7 +228,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou // newIndices[i]=-1; KexiFormDataItemInterface *item = m_dataItems.at( *it ); if (item) - item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") ); + item->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") ); m_dataItems.remove(*it); kexipluginsdbg << "invalidateDataSources(): " << (*it) << " -> " << -1 << endl; // i++; @@ -253,7 +253,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou else { kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl; m_dataItems.remove(it.key()); - it.key()->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") ); + it.key()->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") ); } } #endif @@ -275,7 +275,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou for (TQPtrListIterator<KexiFormDataItemInterface> it(m_dataItems); it.current();) { KexiFormDataItemInterface * item = it.current(); if (invalidSources[ item->dataSource().lower() ]) { - item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") ); + item->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") ); m_dataItems.remove(item); continue; } diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index e9ff41775..5b7e46db7 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -65,9 +65,9 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) TQVBoxLayout *contentsVlyr = new TQVBoxLayout(contents); m_noDataSourceAvailableLabel = new TQLabel(m_noDataSourceAvailableSingleText, contents); - m_noDataSourceAvailableLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + m_noDataSourceAvailableLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); m_noDataSourceAvailableLabel->setMargin(2); - m_noDataSourceAvailableLabel->tqsetAlignment(TQt::WordBreak | TQt::AlignBottom | TQt::AlignLeft); + m_noDataSourceAvailableLabel->setAlignment(TQt::WordBreak | TQt::AlignBottom | TQt::AlignLeft); contentsVlyr->addWidget(m_noDataSourceAvailableLabel); //-Widget's Data Source @@ -78,10 +78,10 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) #else m_widgetDSLabel = new TQLabel(i18n("Table Field or Query Field", "Widget's data source:"), contents); #endif - m_widgetDSLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + m_widgetDSLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_widgetDSLabel->setMargin(2); m_widgetDSLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - m_widgetDSLabel->tqsetAlignment(AlignLeft|AlignBottom); + m_widgetDSLabel->setAlignment(AlignLeft|AlignBottom); hlyr->addWidget(m_widgetDSLabel); m_clearWidgetDSButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearWidgetDSButton"); @@ -104,10 +104,10 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) //- Form's Data Source hlyr = new TQHBoxLayout(contentsVlyr); m_dataSourceLabel = new TQLabel(i18n("Form's data source:"), contents); - m_dataSourceLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + m_dataSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_dataSourceLabel->setMargin(2); m_dataSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - m_dataSourceLabel->tqsetAlignment(AlignLeft|AlignBottom); + m_dataSourceLabel->setAlignment(AlignLeft|AlignBottom); hlyr->addWidget(m_dataSourceLabel); m_gotoButton = new KexiSmallToolButton(contents, TQString(), "goto", "gotoButton"); @@ -160,14 +160,14 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_mousePointerLabel->setFixedWidth( m_mousePointerLabel->pixmap() ? m_mousePointerLabel->pixmap()->width() : 0); m_availableFieldsDescriptionLabel = new TQLabel( i18n("Select fields from the list below and drag them onto a form or click the \"Insert\" button"), contents); - m_availableFieldsDescriptionLabel->tqsetAlignment( TQt::AlignAuto | TQt::WordBreak ); + m_availableFieldsDescriptionLabel->setAlignment( TQt::AlignAuto | TQt::WordBreak ); hlyr->addWidget(m_availableFieldsDescriptionLabel); //Available Fields contentsVlyr->addSpacing(4); hlyr = new TQHBoxLayout(contentsVlyr); m_availableFieldsLabel = new TQLabel(i18n("Available fields:"), contents); - m_availableFieldsLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + m_availableFieldsLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_availableFieldsLabel->setMargin(2); m_availableFieldsLabel->setMinimumHeight(IconSize(KIcon::Small)); hlyr->addWidget(m_availableFieldsLabel); @@ -183,7 +183,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_fieldListView = new KexiFieldListView(contents, "fieldListView", KexiFieldListView::ShowDataTypes | KexiFieldListView::AllowMultiSelection ); - m_fieldListView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); + m_fieldListView->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); m_availableFieldsLabel->setBuddy(m_fieldListView); contentsVlyr->addWidget(m_fieldListView, 1); connect(m_fieldListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotFieldListViewSelectionChanged())); diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 3f47a6ec4..e882c0825 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -398,9 +398,9 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, /* else if(c == "KexiDBTimeEdit") w = new KexiDBTimeEdit(TQTime::currentTime(), p, n); else if(c == "KexiDBDateEdit") - w = new KexiDBDateEdit(TQDate::tqcurrentDate(), p, n); + w = new KexiDBDateEdit(TQDate::currentDate(), p, n); else if(c == "KexiDBDateTimeEdit") - w = new KexiDBDateTimeEdit(TQDateTime::tqcurrentDateTime(), p, n);*/ + w = new KexiDBDateTimeEdit(TQDateTime::currentDateTime(), p, n);*/ // else if(c == "KexiDBIntSpinBox") // w = new KexiDBIntSpinBox(p, n); // else if(c == "KexiDBDoubleSpinBox") @@ -497,7 +497,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign } if ( classname == "KexiDBLabel" ) - w->resize(w->tqsizeHint()); + w->resize(w->sizeHint()); } else { diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 9c4e3173d..84c50efd7 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -510,7 +510,7 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow* void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget) { - TQStrList signalNames(widget->tqmetaObject()->signalNames()); + TQStrList signalNames(widget->metaObject()->signalNames()); if (!signalNames.isEmpty()) { const char *handleDragMoveEventSignal = "handleDragMoveEvent(TQDragMoveEvent*)"; const char *handleDropEventSignal = "handleDropEvent(TQDropEvent*)"; diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index df5191ed7..790064e27 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -551,7 +551,7 @@ void KexiFormScrollView::refreshContentsSize() void KexiFormScrollView::handleDataWidgetAction(const TQString& actionName) { - TQWidget *w = tqfocusWidget(); + TQWidget *w = focusWidget(); KexiFormDataItemInterface *item = 0; while (w) { item = dynamic_cast<KexiFormDataItemInterface*>(w); diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp index 01ec080f7..3b7968de7 100644 --- a/kexi/plugins/forms/kexiformview.cpp +++ b/kexi/plugins/forms/kexiformview.cpp @@ -345,8 +345,8 @@ void KexiFormView::updateValuesForSubproperties() kexipluginsdbg << "KexiFormView::loadForm(): delayed setting of the subproperty: widget=" << it.current()->widget()->name() << " prop=" << subpropIt.key() << " val=" << subpropIt.data() << endl; - const int count = subwidget->tqmetaObject()->findProperty(subpropIt.key().latin1(), true); - const TQMetaProperty *meta = count!=-1 ? subwidget->tqmetaObject()->property(count, true) : 0; + const int count = subwidget->metaObject()->findProperty(subpropIt.key().latin1(), true); + const TQMetaProperty *meta = count!=-1 ? subwidget->metaObject()->property(count, true) : 0; if (meta) { // Special case: the property value of type enum (set) but is saved as a string list, // not as int, so we need to translate it to int. It's been created as such @@ -371,7 +371,7 @@ void KexiFormView::updateValuesForSubproperties() static void setUnsavedBLOBIdsForDataViewMode( TQWidget* widget, const TQMap<TQCString, KexiBLOBBuffer::Id_t>& unsavedLocalBLOBsByName) { - if (-1 != widget->tqmetaObject()->findProperty("pixmapId")) { + if (-1 != widget->metaObject()->findProperty("pixmapId")) { const KexiBLOBBuffer::Id_t blobID = unsavedLocalBLOBsByName[ widget->name() ]; if (blobID > 0) widget->setProperty("pixmapId", (uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by TQVariant - will be fixed in TQt4*/)blobID); @@ -525,9 +525,9 @@ KexiFormView::afterSwitchFrom(int mode) //set focus on 1st focusable widget which has valid dataSource property set if (!m_dbform->orderedFocusWidgets()->isEmpty()) { -// TQWidget *www = tqfocusWidget(); - //if (Kexi::hasParent(this, tqApp->tqfocusWidget())) { - KexiUtils::unsetFocusWithReason(tqApp->tqfocusWidget(), TQFocusEvent::Tab); +// TQWidget *www = focusWidget(); + //if (Kexi::hasParent(this, tqApp->focusWidget())) { + KexiUtils::unsetFocusWithReason(tqApp->focusWidget(), TQFocusEvent::Tab); //} TQPtrListIterator<TQWidget> it(*m_dbform->orderedFocusWidgets()); @@ -999,14 +999,14 @@ void KexiFormView::setFocusInternal() { if (viewMode() == Kexi::DataViewMode) { - if (m_dbform->tqfocusWidget()) { + if (m_dbform->focusWidget()) { //better-looking focus if (m_setFocusInternalOnce) { KexiUtils::setFocusWithReason(m_setFocusInternalOnce, TQFocusEvent::Other);//Tab); m_setFocusInternalOnce = 0; } else { - //ok? SET_FOCUS_USING_REASON(m_dbform->tqfocusWidget(), TQFocusEvent::Other);//Tab); + //ok? SET_FOCUS_USING_REASON(m_dbform->focusWidget(), TQFocusEvent::Other);//Tab); } return; } @@ -1173,8 +1173,8 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s // newWidget->setDataSource(column->aliasOrName()); // newWidget->setFieldTypeInternal((int)column->field->type()); // newWidget->setFieldCaptionInternal(column->captionOrAliasOrName()); - //resize again because autofield's type changed what can lead to changed tqsizeHint() -// newWidget->resize(newWidget->tqsizeHint()); + //resize again because autofield's type changed what can lead to changed sizeHint() +// newWidget->resize(newWidget->sizeHint()); KFormDesigner::WidgetList list; list.append(newWidget); KFormDesigner::AdjustSizeCommand *adjustCommand diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index 7ebc522f6..939d9b91c 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -245,7 +245,7 @@ KexiDBAutoField::setLabelPosition(LabelPosition position) align ^= AlignVertical_Mask; align |= AlignVCenter; } - d->label->tqsetAlignment(align); + d->label->setAlignment(align); if(d->widgetType == Boolean || (d->widgetType == Auto && fieldTypeInternal() == KexiDB::Field::InvalidType && !d->designMode)) { @@ -263,20 +263,20 @@ KexiDBAutoField::setLabelPosition(LabelPosition position) if (subwidgetInterface->appendStretchRequired(this)) d->tqlayout->addStretch(0); if (subwidgetInterface->subwidgetStretchRequired(this)) { - TQSizePolicy sizePolicy( m_subwidget->tqsizePolicy() ); + TQSizePolicy sizePolicy( m_subwidget->sizePolicy() ); if(position == Left) { sizePolicy.setHorData( TQSizePolicy::Minimum ); - d->label->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + d->label->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); } else { sizePolicy.setVerData( TQSizePolicy::Minimum ); - d->label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + d->label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); } - m_subwidget->tqsetSizePolicy(sizePolicy); + m_subwidget->setSizePolicy(sizePolicy); } } // if(m_subwidget) - // m_subwidget->tqsetSizePolicy(...); + // m_subwidget->setSizePolicy(...); } else { d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this); @@ -570,7 +570,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify) bool unbound = false; if (d->autoCaption && (d->widgetType==Auto || dataSource().isEmpty())) { if (d->designMode) - realText = TQString::tqfromLatin1(name())+" "+i18n("Unbound Auto Field", "(unbound)"); + realText = TQString::fromLatin1(name())+" "+i18n("Unbound Auto Field", "(unbound)"); else realText = TQString(); unbound = true; @@ -594,9 +594,9 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify) } if (unbound) - d->label->tqsetAlignment( TQt::AlignCenter | TQt::WordBreak ); + d->label->setAlignment( TQt::AlignCenter | TQt::WordBreak ); else - d->label->tqsetAlignment( TQt::AlignCenter ); + d->label->setAlignment( TQt::AlignCenter ); // TQWidget* widgetToAlterForegroundColor; if(d->widgetType == Boolean) { static_cast<TQCheckBox*>((TQWidget*)m_subwidget)->setText(realText); @@ -650,15 +650,15 @@ KexiDBAutoField::setDataSource( const TQString &ds ) { } TQSize -KexiDBAutoField::tqsizeHint() const +KexiDBAutoField::sizeHint() const { if (d->lblPosition == NoLabel) - return m_subwidget ? m_subwidget->tqsizeHint() : TQWidget::tqsizeHint(); + return m_subwidget ? m_subwidget->sizeHint() : TQWidget::sizeHint(); TQSize s1(0,0); if (m_subwidget) - s1 = m_subwidget->tqsizeHint(); - TQSize s2(d->label->tqsizeHint()); + s1 = m_subwidget->sizeHint(); + TQSize s2(d->label->sizeHint()); if (d->lblPosition == Top) return TQSize(TQMAX(s1.width(), s2.width()), s1.height()+KexiDBAutoField_SPACING+s2.height()); @@ -682,10 +682,10 @@ KexiDBAutoField::updateInformationAboutUnboundField() if ( (d->autoCaption && (dataSource().isEmpty() || dataSourceMimeType().isEmpty())) || (!d->autoCaption && d->caption.isEmpty()) ) { - d->label->setText( TQString::tqfromLatin1(name())+" "+i18n("Unbound Auto Field", " (unbound)") ); + d->label->setText( TQString::fromLatin1(name())+" "+i18n("Unbound Auto Field", " (unbound)") ); } // else -// d->label->setText( TQString::tqfromLatin1(name())+" "+i18n(" (unbound)") ); +// d->label->setText( TQString::fromLatin1(name())+" "+i18n(" (unbound)") ); } /*void @@ -701,7 +701,7 @@ KexiDBAutoField::paintEvent( TQPaintEvent* pe ) p.setClipRect(pe->rect()); p.setFont(d->label->font()); p.drawText(rect(), TQt::AlignLeft | TQt::WordBreak, - TQString::tqfromLatin1(name())+" "+i18n(" (unbound)")); + TQString::fromLatin1(name())+" "+i18n(" (unbound)")); } }*/ diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h index 653e4067b..809c1186a 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.h +++ b/kexi/plugins/forms/widgets/kexidbautofield.h @@ -132,7 +132,7 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField : /*! @internal */ TQString fieldCaptionInternal() const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void setFocusPolicy ( TQ_FocusPolicy policy ); //! Reimplemented to return internal editor's color. diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index 81c66ba6b..231003cfd 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -59,7 +59,7 @@ class KexiDBComboBox::Private KexiComboBoxPopup *popup; KComboBox *paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle (because styles use <static_cast>) - TQSize tqsizeHint; //!< A cache for KexiDBComboBox::tqsizeHint(), + TQSize sizeHint; //!< A cache for KexiDBComboBox::sizeHint(), //!< rebuilt by KexiDBComboBox::fontChange() and KexiDBComboBox::styleChange() KexiDB::QueryColumnInfo* visibleColumnInfo; TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its tqchildren (if isEditable is false) @@ -146,7 +146,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) //! @todo support reverse tqlayout //bool reverse = TQApplication::reverseLayout(); - tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg, + tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg, flags, (uint)TQStyle::SC_All, (d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None ) ); @@ -159,7 +159,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) if ( hasFocus() ) { if (0==qstrcmp(tqstyle().name(), "windows")) //a hack p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) ); - TQRect r( TQStyle::tqvisualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); + TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight())); @@ -170,7 +170,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) TQRect KexiDBComboBox::editorGeometry() const { - TQRect r( TQStyle::tqvisualRect( + TQRect r( TQStyle::visualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxEditField), d->paintedCombo ) ); @@ -211,20 +211,20 @@ void KexiDBComboBox::createEditor() void KexiDBComboBox::setLabelPosition(LabelPosition position) { if(m_subwidget) { - if (-1 != m_subwidget->tqmetaObject()->findProperty("frameShape", true)) + if (-1 != m_subwidget->metaObject()->findProperty("frameShape", true)) m_subwidget->setProperty("frameShape", TQVariant((int)TQFrame::NoFrame)); m_subwidget->setGeometry( editorGeometry() ); } // KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget); // update size policy // if (subwidgetInterface && subwidgetInterface->subwidgetStretchRequired(this)) { - TQSizePolicy sizePolicy( this->tqsizePolicy() ); + TQSizePolicy sizePolicy( this->sizePolicy() ); if(position == Left) sizePolicy.setHorData( TQSizePolicy::Minimum ); else sizePolicy.setVerData( TQSizePolicy::Minimum ); - //m_subwidget->tqsetSizePolicy(sizePolicy); - tqsetSizePolicy(sizePolicy); + //m_subwidget->setSizePolicy(sizePolicy); + setSizePolicy(sizePolicy); //} // } } @@ -233,7 +233,7 @@ TQRect KexiDBComboBox::buttonGeometry() const { TQRect arrowRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) ); - arrowRect = TQStyle::tqvisualRect(arrowRect, d->paintedCombo); + arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo); arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style return arrowRect; } @@ -490,29 +490,29 @@ int KexiDBComboBox::popupWidthHint() const void KexiDBComboBox::fontChange( const TQFont & oldFont ) { - d->tqsizeHint = TQSize(); //force rebuild the cache + d->sizeHint = TQSize(); //force rebuild the cache KexiDBAutoField::fontChange(oldFont); } void KexiDBComboBox::styleChange( TQStyle& oldStyle ) { KexiDBAutoField::styleChange( oldStyle ); - d->tqsizeHint = TQSize(); //force rebuild the cache + d->sizeHint = TQSize(); //force rebuild the cache if (m_subwidget) m_subwidget->setGeometry( editorGeometry() ); } -TQSize KexiDBComboBox::tqsizeHint() const +TQSize KexiDBComboBox::sizeHint() const { - if ( isVisible() && d->tqsizeHint.isValid() ) - return d->tqsizeHint; + if ( isVisible() && d->sizeHint.isValid() ) + return d->sizeHint; const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18; const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2; - d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, + d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut())); - return d->tqsizeHint; + return d->sizeHint; } void KexiDBComboBox::editRequested() diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h index 4e780aa35..dec6da1dc 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.h +++ b/kexi/plugins/forms/widgets/kexidbcombobox.h @@ -68,7 +68,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox : //! Reimpemented because to avoid taking value from the internal editor (index is taken from the popup instead) virtual bool valueChanged(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; //! Reimplemented after KexiDBAutoField: jsut sets \a cinfo without initializing a subwidget. //! Initialization is performed by \ref setVisibleColumnInfo(). diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index 8394ef58f..3058f02cf 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -37,7 +37,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_edit = new TQDateEdit(date, this); m_edit->setAutoAdvance(true); - m_edit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&)) ); connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateChanged(const TQDate&)) ); @@ -54,7 +54,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_datePickerPopupMenu = new KPopupMenu(0, "date_popup"); connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); - m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::tqcurrentDate(), 0); + m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable"); if (dt) diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index ea9dede77..629a4bcaa 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -36,7 +36,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_dateEdit = new TQDateEdit(datetime.date(), this); m_dateEdit->setAutoAdvance(true); - m_dateEdit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); + m_dateEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); // m_dateEdit->setFixedWidth( TQFontMetrics(m_dateEdit->font()).width("8888-88-88___") ); connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged())); connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateTimeChanged())); @@ -48,7 +48,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_timeEdit = new TQTimeEdit(datetime.time(), this);; m_timeEdit->setAutoAdvance(true); - m_timeEdit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); + m_timeEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged())); connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SIGNAL(dateTimeChanged())); @@ -61,7 +61,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_datePickerPopupMenu = new KPopupMenu(0, "date_popup"); connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); - m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::tqcurrentDate(), 0); + m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable"); if (dt) diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index 88ddf93fa..bcf28a584 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -268,7 +268,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi } TQSize -KexiDBForm::tqsizeHint() const +KexiDBForm::sizeHint() const { //todo: find better size (user configured?) return TQSize(400,300); @@ -304,7 +304,7 @@ TQPtrList<TQWidget>* KexiDBForm::orderedDataAwareWidgets() const void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) { TQWidget *fromWidget = 0; - //TQWidget *tqtopLevelWidget = form->widget()->tqtopLevelWidget(); + //TQWidget *topLevelWidget = form->widget()->topLevelWidget(); //js form->updateTabStopsOrder(); //certain widgets can have now updated focusPolicy properties, fix this uint numberOfDataAwareWidgets = 0; // if (d->orderedFocusWidgets.isEmpty()) { @@ -361,7 +361,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) } fromWidget = it.current(); } -// SET_FOCUS_USING_REASON(tqfocusWidget(), TQFocusEvent::Tab); +// SET_FOCUS_USING_REASON(focusWidget(), TQFocusEvent::Tab); }*/ } @@ -399,7 +399,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) bool tab = ke->state() == Qt::NoButton && key == TQt::Key_Tab; bool backtab = ((ke->state() == Qt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab) || (ke->state() == TQt::ShiftButton && key == TQt::Key_Tab); - TQObject *o = watched; //tqfocusWidget(); + TQObject *o = watched; //focusWidget(); TQWidget* realWidget = dynamic_cast<TQWidget*>(o); //will beused below (for tab/backtab handling) if (!tab && !backtab) { diff --git a/kexi/plugins/forms/widgets/kexidbform.h b/kexi/plugins/forms/widgets/kexidbform.h index fc0d25c27..297989476 100644 --- a/kexi/plugins/forms/widgets/kexidbform.h +++ b/kexi/plugins/forms/widgets/kexidbform.h @@ -69,7 +69,7 @@ class KEXIFORMUTILS_EXPORT KexiDBForm : virtual void clearForm(); virtual void highlightWidgets(TQWidget *from, TQWidget *to/*, const TQPoint &p*/); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; bool autoTabStops() const; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 4165c0000..3ff184065 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -80,7 +80,7 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n , m_insideSetPalette(false) { installEventFilter(this); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); //setup popup menu m_popupMenu = new KexiImageContextMenu(this); @@ -522,17 +522,17 @@ void KexiDBImageBox::slotToggled(bool on) TQRect screen = tqApp->desktop()->availableGeometry( m_chooser ); TQPoint p; if ( TQApplication::reverseLayout() ) { - if ( (mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->tqsizeHint().height()) <= screen.height() ) + if ( (mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->sizeHint().height()) <= screen.height() ) p = m_chooser->mapToGlobal( m_chooser->rect().bottomRight() ); else - p = m_chooser->mapToGlobal( m_chooser->rect().topRight() - TQPoint( 0, m_popupMenu->tqsizeHint().height() ) ); - p.rx() -= m_popupMenu->tqsizeHint().width(); + p = m_chooser->mapToGlobal( m_chooser->rect().topRight() - TQPoint( 0, m_popupMenu->sizeHint().height() ) ); + p.rx() -= m_popupMenu->sizeHint().width(); } else { - if ( (m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->tqsizeHint().height()) <= screen.height() ) + if ( (m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->sizeHint().height()) <= screen.height() ) p = m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ); else - p = m_chooser->mapToGlobal( m_chooser->rect().topLeft() - TQPoint( 0, m_popupMenu->tqsizeHint().height() ) ); + p = m_chooser->mapToGlobal( m_chooser->rect().topLeft() - TQPoint( 0, m_popupMenu->sizeHint().height() ) ); } if (!m_popupMenu->isVisible() && on) { m_popupMenu->exec( p, -1 ); @@ -614,7 +614,7 @@ void KexiDBImageBox::setDataSource( const TQString &ds ) } } -TQSize KexiDBImageBox::tqsizeHint() const +TQSize KexiDBImageBox::sizeHint() const { if (pixmap().isNull()) return TQSize(80, 80); @@ -665,7 +665,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe ) p2.setPen( KexiUtils::contrastColor( bg ) ); p2.drawText(pm.rect(), TQt::AlignCenter, dataSource().isEmpty() - ? TQString::tqfromLatin1(name())+"\n"+i18n("Unbound Image Box", "(unbound)") //i18n("No Image") + ? TQString::fromLatin1(name())+"\n"+i18n("Unbound Image Box", "(unbound)") //i18n("No Image") : dataSource()); p2.end(); bitBlt(this, m, m, &pm); @@ -715,7 +715,7 @@ void KexiDBImageBox::updatePixmap() } } -void KexiDBImageBox::tqsetAlignment(int tqalignment) +void KexiDBImageBox::setAlignment(int tqalignment) { m_tqalignment = tqalignment; if (!m_scaledContents || m_keepAspectRatio) @@ -737,7 +737,7 @@ void KexiDBImageBox::resizeEvent( TQResizeEvent * e ) { KexiFrame::resizeEvent(e); if (m_chooser) { - TQSize s( m_chooser->tqsizeHint() ); + TQSize s( m_chooser->sizeHint() ); TQSize margin( realLineWidth(), realLineWidth() ); s.setHeight( height() - 2*margin.height() ); s = s.boundedTo( size()-2*margin ); diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h index 32b4e9b15..a7adb3c8c 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.h +++ b/kexi/plugins/forms/widgets/kexidbimagebox.h @@ -48,7 +48,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : TQ_PROPERTY( uint storedPixmapId READ storedPixmapId WRITE setStoredPixmapId DESIGNABLE false STORED true ) TQ_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents ) TQ_PROPERTY( bool keepAspectRatio READ keepAspectRatio WRITE setKeepAspectRatio ) - TQ_PROPERTY( int tqalignment READ tqalignment WRITE tqsetAlignment ) + TQ_PROPERTY( int tqalignment READ tqalignment WRITE setAlignment ) // TQ_PROPERTY( TQString originalFileName READ originalFileName WRITE setOriginalFileName DESIGNABLE false ) // TQ_OVERRIDE( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy ) TQ_PROPERTY( bool dropDownButtonVisible READ dropDownButtonVisible WRITE setDropDownButtonVisible ) @@ -99,7 +99,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : bool keepAspectRatio() const { return m_keepAspectRatio; } - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; KexiImageContextMenu *contextMenu() const; @@ -158,7 +158,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : void setScaledContents(bool set); - void tqsetAlignment(int tqalignment); + void setAlignment(int tqalignment); void setKeepAspectRatio(bool set); diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index 2d09429e2..2f653f004 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -66,7 +66,7 @@ KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* parent ) int a = tqalignment() | TQt::WordBreak; a &= (0xffffff ^ TQt::AlignVertical_Mask); a |= TQt::AlignTop; - tqsetAlignment( a ); + setAlignment( a ); updateFrame(); } @@ -132,7 +132,7 @@ TQImage KexiDBInternalLabel::makeShadow( const TQImage& textImage, double realOpacity = SHADOW_OPACITY + TQMIN(50.0/double(256.0-tqGray(bgColor.rgb())), 50.0); //int _h, _s, _v; //.getHsv( &_h, &_s, &_v ); - if (tqcolorGroup().background()==TQt::red)//_s>=250 && _v>=250) //for colors like cyan or red, make the result more white + if (colorGroup().background()==TQt::red)//_s>=250 && _v>=250) //for colors like cyan or red, make the result more white realOpacity += 50.0; result.fill( (int)realOpacity ); result.setAlphaBuffer( true ); @@ -177,7 +177,7 @@ KPixmap KexiDBInternalLabel::getShadowPixmap() { /*! * Backup the default color used to draw text. */ - const TQColor textColor = tqcolorGroup().foreground(); + const TQColor textColor = colorGroup().foreground(); /*! * Temporary storage for the generated shadow @@ -232,7 +232,7 @@ KPixmap KexiDBInternalLabel::getShadowPixmap() { TQMIN( m_shadowRect.y() + ( m_shadowRect.height() * 3 / 2 ), shadowImage.height() ) ) ); shadowImage = makeShadow( shadowImage, - tqGray( tqcolorGroup().background().rgb() ) < 127 ? TQt::white : TQt::black, + tqGray( colorGroup().background().rgb() ) < 127 ? TQt::white : TQt::black, m_shadowRect ); if (shadowImage.isNull()) return KPixmap(); @@ -426,7 +426,7 @@ void KexiDBLabel::init() d->internalLabel->hide(); d->frameColor = tqpalette().active().foreground(); - tqsetAlignment( d->internalLabel->tqalignment() ); + setAlignment( d->internalLabel->tqalignment() ); } void KexiDBLabel::updatePixmapLater() { @@ -453,7 +453,7 @@ void KexiDBLabel::updatePixmap() { d->internalLabel->setText( text() ); d->internalLabel->setFixedSize( size() ); d->internalLabel->setPalette( palette() ); - d->internalLabel->tqsetAlignment( tqalignment() ); + d->internalLabel->setAlignment( tqalignment() ); // d->shadowPixmap = KPixmap(); //parallel repaints won't hurt us cause incomplete pixmap KPixmap shadowPixmap = d->internalLabel->getShadowPixmap(); if (shadowPixmap.isNull()) diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp index 9c24df4a9..8b4149a97 100644 --- a/kexi/plugins/forms/widgets/kexidbsubform.cpp +++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp @@ -33,7 +33,7 @@ KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent, : TQScrollView(parent, name), m_parentForm(parentForm), m_form(0), m_widget(0) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); - viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); + viewport()->setPaletteBackgroundColor(colorGroup().mid()); } /* void diff --git a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp index 331909eed..7adfbaa89 100644 --- a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp +++ b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp @@ -26,7 +26,7 @@ void ClassName::drawFrame( TQPainter *p ) if ( frameShadow() == Plain ) qDrawPlainRect( p, frameRect(), d->frameColor, lineWidth() ); else - qDrawShadeRect( p, frameRect(), tqcolorGroup(), frameShadow() == TQFrame::Sunken, + qDrawShadeRect( p, frameRect(), colorGroup(), frameShadow() == TQFrame::Sunken, lineWidth(), midLineWidth() ); } else { @@ -98,7 +98,7 @@ void TQFrame::drawFrame( TQPainter *p ) p->setPen( black ); // #### p->drawRect( r ); //### a bit too simple #else - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); #ifndef TQT_NO_STYLE TQStyleOption opt(lineWidth(),midLineWidth()); @@ -162,24 +162,24 @@ void TQFrame::drawFrame( TQPainter *p ) case PopupPanel: #ifndef TQT_NO_STYLE { - int vextra = style().tqpixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this), - hextra = style().tqpixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this); + int vextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this), + hextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this); if(vextra > 0 || hextra > 0) { TQRect fr = frameRect(); int fw = frameWidth(); if(vextra > 0) { - style().tqdrawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this, + style().drawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this, TQRect(fr.x() + fw, fr.y() + fw, fr.width() - (fw*2), vextra), g, flags, opt); - style().tqdrawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this, + style().drawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this, TQRect(fr.x() + fw, fr.bottom() - fw - vextra, fr.width() - (fw*2), vextra), g, flags, opt); } if(hextra > 0) { - style().tqdrawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this, + style().drawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this, TQRect(fr.x() + fw, fr.y() + fw + vextra, hextra, fr.height() - (fw*2) - vextra), g, flags, opt); - style().tqdrawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this, + style().drawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this, TQRect(fr.right() - fw - hextra, fr.y() + fw + vextra, hextra, fr.height() - (fw*2) - vextra), g, flags, opt); } diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 6e9859012..e89f6a65c 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -137,12 +137,12 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_exportOptionsPage); connect(m_showOptionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowOptionsButtonClicked())); exportOptionsLyr->addMultiCellWidget(m_showOptionsButton, 2, 2, 0, 0); - m_showOptionsButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); // -<options section> m_exportOptionsSection = new TQGroupBox(1,Qt::Vertical, i18n("Options"), m_exportOptionsPage, "m_exportOptionsSection"); - m_exportOptionsSection->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_exportOptionsSection->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); exportOptionsLyr->addMultiCellWidget(m_exportOptionsSection, 3, 3, 0, 1); TQWidget *exportOptionsSectionWidget = new TQWidget(m_exportOptionsSection, "exportOptionsSectionWidget"); @@ -170,7 +170,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, // - character encoding m_characterEncodingCombo = new KexiCharacterEncodingComboBox( exportOptionsSectionWidget ); - m_characterEncodingCombo->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_characterEncodingCombo->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); exportOptionsSectionLyr->addWidget( m_characterEncodingCombo, 2, 1 ); TQLabel *characterEncodingLabel = new TQLabel(m_characterEncodingCombo, i18n("Text encoding:"), exportOptionsSectionWidget); @@ -222,8 +222,8 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, updateGeometry(); // -keep widths equal on page #2: - int width = TQMAX( m_infoLblFrom->leftLabel()->tqsizeHint().width(), - m_infoLblTo->leftLabel()->tqsizeHint().width()); + int width = TQMAX( m_infoLblFrom->leftLabel()->sizeHint().width(), + m_infoLblTo->leftLabel()->sizeHint().width()); m_infoLblFrom->leftLabel()->setFixedWidth(width); m_infoLblTo->leftLabel()->setFixedWidth(width); } @@ -376,7 +376,7 @@ void KexiCSVExportWizard::slotDefaultsButtonClicked() static TQString convertKey(const char *key, KexiCSVExport::Mode mode) { - TQString _key(TQString::tqfromLatin1(key)); + TQString _key(TQString::fromLatin1(key)); if (mode == KexiCSVExport::Clipboard) { _key.replace("Exporting", "Copying"); _key.replace("Export", "Copy"); diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 18398d39f..5dd04ed9f 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -192,7 +192,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, setIcon(DesktopIcon(_IMPORT_ICON)); setSizeGripEnabled( TRUE ); -// m_encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); +// m_encoding = TQString::fromLatin1(KGlobal::locale()->encoding()); // m_stripWhiteSpaceInTextValuesChecked = true; m_file = 0; m_inputStream = 0; @@ -216,7 +216,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, glyr->addMultiCellWidget( m_delimiterWidget, 1, 2, 0, 0 ); TQLabel *delimiterLabel = new TQLabel(m_delimiterWidget, i18n("Delimiter:"), page); - delimiterLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom); + delimiterLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom); glyr->addMultiCellWidget( delimiterLabel, 0, 0, 0, 0 ); // Format: number, text, currency, @@ -230,7 +230,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, glyr->addMultiCellWidget( m_formatCombo, 1, 1, 1, 1 ); m_formatLabel = new TQLabel(m_formatCombo, "", page); - m_formatLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom); + m_formatLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom); glyr->addWidget( m_formatLabel, 0, 1 ); m_primaryKeyField = new TQCheckBox( i18n( "Primary key" ), page, "m_primaryKeyField" ); @@ -241,20 +241,20 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, glyr->addWidget( m_comboQuote, 1, 2 ); TextLabel2 = new TQLabel( m_comboQuote, i18n( "Text quote:" ), page, "TextLabel2" ); - TextLabel2->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); - TextLabel2->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom); + TextLabel2->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); + TextLabel2->setAlignment(TQt::AlignAuto | TQt::AlignBottom); glyr->addWidget( TextLabel2, 0, 2 ); m_startAtLineSpinBox = new KIntSpinBox( page, "m_startAtLineSpinBox" ); m_startAtLineSpinBox->setMinValue(1); - m_startAtLineSpinBox->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + m_startAtLineSpinBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); m_startAtLineSpinBox->setMinimumWidth(TQFontMetrics(m_startAtLineSpinBox->font()).width("8888888")); glyr->addWidget( m_startAtLineSpinBox, 1, 3 ); m_startAtLineLabel = new TQLabel( m_startAtLineSpinBox, "", page, "TextLabel3" ); - m_startAtLineLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); - m_startAtLineLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom); + m_startAtLineLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); + m_startAtLineLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom); glyr->addWidget( m_startAtLineLabel, 0, 3 ); TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred ); @@ -271,7 +271,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, m_table = new KexiCSVImportDialogTable( plainPage(), "m_table" ); lyr->addWidget( m_table ); - m_table->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) ); + m_table->setSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) ); m_table->setNumRows( 0 ); m_table->setNumCols( 0 ); @@ -294,7 +294,7 @@ if ( m_mode == Clipboard ) m_cancelled = true; return; } - m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) ); + m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) ); } else if ( mode == File ) {*/ diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp index ed1a5b304..49b723234 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp @@ -37,7 +37,7 @@ KexiCSVImportOptions::KexiCSVImportOptions() kapp->config()->setGroup("ImportExport"); encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles"); if (encoding.isEmpty()) { - encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); + encoding = TQString::fromLatin1(KGlobal::locale()->encoding()); defaultEncodingExplicitySet = false; } else diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp index 48d907b99..aaa969088 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp @@ -57,7 +57,7 @@ KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget setFocusProxy(m_combo); m_delimiterEdit = new KLineEdit( this, "m_delimiterEdit" ); -// m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); +// m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) ); m_delimiterEdit->setMaxLength(1); lyr->addWidget( m_delimiterEdit ); @@ -162,19 +162,19 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent vbox->addLayout(hbox); m_leftLabel = new TQLabel(labelText, this); m_leftLabel->setMinimumWidth(130); - m_leftLabel->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); - m_leftLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); + m_leftLabel->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + m_leftLabel->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); hbox->addWidget(m_leftLabel); m_iconLbl = new TQLabel(this); - m_iconLbl->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); - m_iconLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft); + m_iconLbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + m_iconLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft); m_fnameLbl = new KActiveLabel(this); m_fnameLbl->setFocusPolicy(TQ_NoFocus); m_fnameLbl->setTextFormat(TQt::PlainText); - m_fnameLbl->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0)); + m_fnameLbl->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0)); m_fnameLbl->setLineWidth(1); m_fnameLbl->setFrameStyle(TQFrame::Box); - m_fnameLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); + m_fnameLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); hbox->addSpacing(5); hbox->addWidget(m_iconLbl); hbox->addWidget(m_fnameLbl, 1, TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); @@ -182,10 +182,10 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent m_commentLbl = new KActiveLabel(this); m_commentLbl->setFocusPolicy(TQ_NoFocus); m_commentLbl->setTextFormat(TQt::PlainText); - m_commentLbl->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_commentLbl->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); m_commentLbl->setLineWidth(1); m_commentLbl->setFrameStyle(TQFrame::Box); - m_commentLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); + m_commentLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); hbox->addWidget(m_commentLbl, 0, TQt::AlignVCenter | TQt::AlignRight | TQt::WordBreak); m_separator = new TQFrame(this); diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index d44b8aeec..72c450017 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -53,7 +53,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index e67794be8..d5e576f9e 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -351,7 +351,7 @@ class EditListBoxItem : public ListBoxItem m_widget->reparent(listBox(), 0, TQPoint(1,1)); //tqlayout->addWidget(m_widget, 1); m_widget->setMinimumHeight(5); - m_widget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_widget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); } private: @@ -520,7 +520,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, d->listbox = new ListBox(d->combobox, d->macroproperty); d->combobox->setEditable(true); d->combobox->setListBox(d->listbox); - d->combobox->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + d->combobox->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->combobox->setMinimumHeight(5); d->combobox->setInsertionPolicy(TQComboBox::NoInsertion); d->combobox->setMinimumSize(10, 0); // to allow the combo to be resized to a small size diff --git a/kexi/plugins/macros/lib/metaobject.cpp b/kexi/plugins/macros/lib/metaobject.cpp index e9e56b448..0916fe37b 100644 --- a/kexi/plugins/macros/lib/metaobject.cpp +++ b/kexi/plugins/macros/lib/metaobject.cpp @@ -77,18 +77,18 @@ TQObject* const MetaObject::object() const /* TQStrList MetaObject::signalNames() const { - return object()->tqmetaObject()->signalNames(); + return object()->metaObject()->signalNames(); } TQStrList MetaObject::slotNames() const { - return object()->tqmetaObject()->slotNames(); + return object()->metaObject()->slotNames(); } */ int MetaObject::indexOfSignal(const char* signal) const { - TQMetaObject* metaobject = object()->tqmetaObject(); + TQMetaObject* metaobject = object()->metaObject(); int signalid = metaobject->findSignal(signal, false); if(signalid < 0) { throw Exception(TQString("Invalid signal \"%1\"").tqarg(signal)); @@ -98,7 +98,7 @@ int MetaObject::indexOfSignal(const char* signal) const int MetaObject::indexOfSlot(const char* slot) const { - TQMetaObject* metaobject = object()->tqmetaObject(); + TQMetaObject* metaobject = object()->metaObject(); int slotid = metaobject->findSlot(slot, false); if(slotid < 0) { throw Exception(TQString("Invalid slot \"%1\"").tqarg(slot)); @@ -110,7 +110,7 @@ KSharedPtr<MetaMethod> MetaObject::method(int index) { TQObject* obj = object(); MetaMethod::Type type = MetaMethod::Slot; - TQMetaObject* metaobject = obj->tqmetaObject(); + TQMetaObject* metaobject = obj->metaObject(); const TQMetaData* metadata = metaobject->slot(index, true); if(! metadata) { diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui index a1f28a794..ed1864f6e 100644 --- a/kexi/plugins/queries/kexiaddparamwidget.ui +++ b/kexi/plugins/queries/kexiaddparamwidget.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index e215ab909..c6708e7f2 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -193,8 +193,8 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( addChildView(d->relations); addChildView(d->dataTable); setViewWidget(d->dataTable, true); - d->relations->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); - d->head->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); + d->relations->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); + d->head->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); updateGeometry(); d->spl->setSizes(TQValueList<int>()<< 800<<400); } @@ -624,7 +624,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode) if (!m_dialog->neverSaved()) { if (!loadLayout()) { //err msg - parentDialog()->settqStatus(conn, + parentDialog()->setStatus(conn, i18n("Query definition loading failed."), i18n("Query design may be corrupted so it could not be opened even in text view.\n" "You can delete the query and create it again.")); @@ -639,7 +639,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode) KexiDB::ResultInfo result; showFieldsForQuery( q, result ); if (!result.success) { - parentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); + parentDialog()->setStatus(&result, i18n("Query definition loading failed.")); tempData()->proposeOpeningInTextViewModeBecauseOfProblems = true; return false; } @@ -662,7 +662,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode) KexiDB::ResultInfo result; showFieldsAndRelationsForQuery( tempData()->query(), result ); if (!result.success) { - parentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); + parentDialog()->setStatus(&result, i18n("Query definition loading failed.")); return false; } } @@ -1083,7 +1083,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout() KexiDB::ResultInfo result; showRelationsForQuery( q, result ); if (!result.success) { - parentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); + parentDialog()->setStatus(&result, i18n("Query definition loading failed.")); return false; } } @@ -1177,10 +1177,10 @@ bool KexiQueryDesignerGuiEditor::storeLayout() return true; } -TQSize KexiQueryDesignerGuiEditor::tqsizeHint() const +TQSize KexiQueryDesignerGuiEditor::sizeHint() const { - TQSize s1 = d->relations->tqsizeHint(); - TQSize s2 = d->head->tqsizeHint(); + TQSize s1 = d->relations->sizeHint(); + TQSize s2 = d->head->sizeHint(); return TQSize(TQMAX(s1.width(),s2.width()), s1.height()+s2.height()); } diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h index c97c140dc..d96fd9876 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.h +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h @@ -69,7 +69,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase KexiRelationWidget *relationView() const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: virtual void setFocus(); diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 37fab0e61..43353b847 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -73,7 +73,7 @@ class KexiQueryDesignerSQLView::Private } KexiQueryDesignerSQLEditor *editor; KexiQueryDesignerSQLHistory *history; - TQLabel *pixmaptqStatus, *lbltqStatus; + TQLabel *pixmapStatus, *lblStatus; TQHBox *status_hbox; TQVBox *history_section; KexiSectionHeader *head, *historyHead; @@ -120,18 +120,18 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi d->status_hbox->installEventFilter(this); d->splitter->setResizeMode(d->history_section, TQSplitter::KeepSize); d->status_hbox->setSpacing(0); - d->pixmaptqStatus = new TQLabel(d->status_hbox); - d->pixmaptqStatus->setFixedWidth(d->statusPixmapOk.width()*3/2); - d->pixmaptqStatus->tqsetAlignment(AlignHCenter | AlignTop); - d->pixmaptqStatus->setMargin(d->statusPixmapOk.width()/4); - d->pixmaptqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) ); - - d->lbltqStatus = new TQLabel(d->status_hbox); - d->lbltqStatus->tqsetAlignment(AlignLeft | AlignTop | WordBreak); - d->lbltqStatus->setMargin(d->statusPixmapOk.width()/4); - d->lbltqStatus->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); - d->lbltqStatus->resize(d->lbltqStatus->width(),d->statusPixmapOk.width()*3); - d->lbltqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) ); + d->pixmapStatus = new TQLabel(d->status_hbox); + d->pixmapStatus->setFixedWidth(d->statusPixmapOk.width()*3/2); + d->pixmapStatus->setAlignment(AlignHCenter | AlignTop); + d->pixmapStatus->setMargin(d->statusPixmapOk.width()/4); + d->pixmapStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) ); + + d->lblStatus = new TQLabel(d->status_hbox); + d->lblStatus->setAlignment(AlignLeft | AlignTop | WordBreak); + d->lblStatus->setMargin(d->statusPixmapOk.width()/4); + d->lblStatus->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + d->lblStatus->resize(d->lblStatus->width(),d->statusPixmapOk.width()*3); + d->lblStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) ); TQHBoxLayout *b = new TQHBoxLayout(this); b->addWidget(d->splitter); @@ -171,36 +171,36 @@ KexiQueryDesignerSQLEditor *KexiQueryDesignerSQLView::editor() const void KexiQueryDesignerSQLView::setStatusOk() { - d->pixmaptqStatus->setPixmap(d->statusPixmapOk); + d->pixmapStatus->setPixmap(d->statusPixmapOk); setStatusText("<h2>"+i18n("The query is correct")+"</h2>"); d->history->addEvent(d->editor->text().stripWhiteSpace(), true, TQString()); } void KexiQueryDesignerSQLView::setStatusError(const TQString& msg) { - d->pixmaptqStatus->setPixmap(d->statusPixmapErr); + d->pixmapStatus->setPixmap(d->statusPixmapErr); setStatusText("<h2>"+i18n("The query is incorrect")+"</h2><p>"+msg+"</p>"); d->history->addEvent(d->editor->text().stripWhiteSpace(), false, msg); } void KexiQueryDesignerSQLView::setStatusEmpty() { - d->pixmaptqStatus->setPixmap(d->statusPixmapInfo); + d->pixmapStatus->setPixmap(d->statusPixmapInfo); setStatusText(i18n("Please enter your query and execute \"Check query\" function to verify it.")); } void KexiQueryDesignerSQLView::setStatusText(const TQString& text) { if (!d->action_toggle_history->isChecked()) { - TQSimpleRichText rt(text, d->lbltqStatus->font()); - rt.setWidth(d->lbltqStatus->width()); + TQSimpleRichText rt(text, d->lblStatus->font()); + rt.setWidth(d->lblStatus->width()); TQValueList<int> sz = d->splitter->sizes(); - const int newHeight = rt.height()+d->lbltqStatus->margin()*2; + const int newHeight = rt.height()+d->lblStatus->margin()*2; if (sz[1]<newHeight) { sz[1] = newHeight; d->splitter->setSizes(sz); } - d->lbltqStatus->setText(text); + d->lblStatus->setText(text); } } diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 7cc626207..503b432ad 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -61,7 +61,7 @@ KexiQueryDesignerSQLHistory::drawContents(TQPainter *p, int cx, int cy, int cw, { p->saveWorldMatrix(); p->translate(0, y); - it->drawItem(p, visibleWidth(), tqcolorGroup()); + it->drawItem(p, visibleWidth(), colorGroup()); p->restoreWorldMatrix(); } y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5; @@ -79,7 +79,7 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e) if(it.current()->isSelected()) { //clear - it.current()->setSelected(false, tqcolorGroup()); + it.current()->setSelected(false, colorGroup()); updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics())); } @@ -94,11 +94,11 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e) //now do update if (popupHistory) { if (m_selected && m_selected != popupHistory) { - m_selected->setSelected(false, tqcolorGroup()); + m_selected->setSelected(false, colorGroup()); updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics())); } m_selected = popupHistory; - m_selected->setSelected(true, tqcolorGroup()); + m_selected->setSelected(true, colorGroup()); updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics())); if(e->button() == Qt::RightButton) { m_popup->exec(e->globalPos()); @@ -142,18 +142,18 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e) resizeContents(visibleWidth() - 1, y); if (m_selected) { - m_selected->setSelected(false, tqcolorGroup()); + m_selected->setSelected(false, colorGroup()); } m_selected = e; - m_selected->setSelected(true, tqcolorGroup()); + m_selected->setSelected(true, colorGroup()); ensureVisible(0,y+5); updateContents(); /* ensureVisible(0, 0); if (m_selected) { - m_selected->setSelected(false, tqcolorGroup()); + m_selected->setSelected(false, colorGroup()); } m_selected = e; - m_selected->setSelected(true, tqcolorGroup()); + m_selected->setSelected(true, colorGroup()); // updateContents(); updateContents(m_selected->tqgeometry(0, visibleWidth(), fontMetrics()));*/ } diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp index c57224ead..1b3c16d7d 100644 --- a/kexi/plugins/queries/kexiqueryview.cpp +++ b/kexi/plugins/queries/kexiqueryview.cpp @@ -83,7 +83,7 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query) } d->cursor = mainWin()->project()->dbConnection()->executeQuery(*query, params); if (!d->cursor) { - parentDialog()->settqStatus(parentDialog()->mainWin()->project()->dbConnection(), + parentDialog()->setStatus(parentDialog()->mainWin()->project()->dbConnection(), i18n("Query executing failed.")); //todo: also provide server result and sql statement return false; diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp index 6c5fae1da..affc1214a 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.cpp +++ b/kexi/plugins/relations/kexirelationmaindlg.cpp @@ -61,7 +61,7 @@ KexiRelationMainDlg::~KexiRelationMainDlg() { } -TQSize KexiRelationMainDlg::tqsizeHint() const +TQSize KexiRelationMainDlg::sizeHint() const { return TQSize(600,300); } diff --git a/kexi/plugins/relations/kexirelationmaindlg.h b/kexi/plugins/relations/kexirelationmaindlg.h index a2f8ca578..69f43242b 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.h +++ b/kexi/plugins/relations/kexirelationmaindlg.h @@ -34,7 +34,7 @@ class KexiRelationMainDlg : public KexiViewBase KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0); ~KexiRelationMainDlg(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQWidget* mainWidget(); diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp index f45b30bf1..dfa8d0d0c 100644 --- a/kexi/plugins/reports/kexireportfactory.cpp +++ b/kexi/plugins/reports/kexireportfactory.cpp @@ -180,7 +180,7 @@ KexiReportFactory::changeText(const TQString &text) TQWidget *w = WidgetFactory::m_widget; changeProperty("text", text, m_container); - int width = w->tqsizeHint().width(); + int width = w->sizeHint().width(); if(w->width() < width) w->resize(width, w->height() ); @@ -212,7 +212,7 @@ KexiReportFactory::editText() } if(classname == "Label") - m_widget->resize(m_widget->tqsizeHint()); + m_widget->resize(m_widget->sizeHint()); } bool diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp index 89423b037..b07311674 100644 --- a/kexi/plugins/reports/kexireportform.cpp +++ b/kexi/plugins/reports/kexireportform.cpp @@ -178,7 +178,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint } TQSize -KexiReportForm::tqsizeHint() const +KexiReportForm::sizeHint() const { //todo: find better size (user configured?) return TQSize(400,300); diff --git a/kexi/plugins/reports/kexireportform.h b/kexi/plugins/reports/kexireportform.h index 8813a2c37..7898ec984 100644 --- a/kexi/plugins/reports/kexireportform.h +++ b/kexi/plugins/reports/kexireportform.h @@ -47,7 +47,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportForm : public TQWidget, public KFormDesig virtual void clearForm(); virtual void highlightWidgets(TQWidget *from, TQWidget *to/*, const TQPoint &p*/); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: /*TQString m_ds; diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp index 443f26d4d..4bd08e5b1 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.cpp +++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp @@ -142,10 +142,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) TQHBoxLayout *hlyr = new TQHBoxLayout(contentsVlyr); d->rowSourceLabel = new TQLabel(i18n("Row source:"), contents); - d->rowSourceLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->rowSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); d->rowSourceLabel->setMargin(2); d->rowSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - d->rowSourceLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom); + d->rowSourceLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom); hlyr->addWidget(d->rowSourceLabel); d->gotoRowSourceButton = new KexiSmallToolButton(contents, TQString(), "goto", "gotoRowSourceButton"); @@ -170,10 +170,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) //- Bound Column hlyr = new TQHBoxLayout(contentsVlyr); d->boundColumnLabel = new TQLabel(i18n("Bound column:"), contents); - d->boundColumnLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->boundColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); d->boundColumnLabel->setMargin(2); d->boundColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - d->boundColumnLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom); + d->boundColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom); hlyr->addWidget(d->boundColumnLabel); d->clearBoundColumnButton = new KexiSmallToolButton(contents, TQString(), @@ -192,10 +192,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) //- Visible Column hlyr = new TQHBoxLayout(contentsVlyr); d->visibleColumnLabel = new TQLabel(i18n("Visible column:"), contents); - d->visibleColumnLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->visibleColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); d->visibleColumnLabel->setMargin(2); d->visibleColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - d->visibleColumnLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom); + d->visibleColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom); hlyr->addWidget(d->visibleColumnLabel); d->clearVisibleColumnButton = new KexiSmallToolButton(contents, TQString(), diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 84ea686c6..190e98349 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -168,7 +168,7 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool))); - setMinimumSize(d->view->tqminimumSizeHint().width(), d->view->tqminimumSizeHint().height()); + setMinimumSize(d->view->minimumSizeHint().width(), d->view->minimumSizeHint().height()); d->view->setFocus(); d->sets = new KexiDataAwarePropertySet( this, d->view ); @@ -1406,7 +1406,7 @@ KexiDB::SchemaData* KexiTableDesignerView::storeNewData(const KexiDB::SchemaData KexiDB::Connection *conn = mainWin()->project()->dbConnection(); res = conn->createTable(tempData()->table); if (res!=true) - parentDialog()->settqStatus(conn, ""); + parentDialog()->setStatus(conn, ""); } if (res == true) { @@ -1489,7 +1489,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk) res = conn->alterTable(*tempData()->table, *newTable); if (res != true) - parentDialog()->settqStatus(conn, ""); + parentDialog()->setStatus(conn, ""); } else { KexiDB::AlterTableHandler::ExecutionArguments args; @@ -1499,7 +1499,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk) << res.toString() << endl; if (true != res) { alterTableHandler->debugError(); - parentDialog()->settqStatus(alterTableHandler, ""); + parentDialog()->setStatus(alterTableHandler, ""); } } } diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui index 0f2248e65..a5ece5757 100644 --- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui +++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp index ff277e7da..de6254b74 100644 --- a/kexi/widget/kexicharencodingcombobox.cpp +++ b/kexi/widget/kexicharencodingcombobox.cpp @@ -31,12 +31,12 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( : KComboBox( parent, "KexiCharacterEncodingComboBox" ) , m_defaultEncodingAdded(false) { - TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding())); + TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding())); TQString defaultEncodingDescriptiveName; TQString _selectedEncoding = selectedEncoding; if (_selectedEncoding.isEmpty()) - _selectedEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); + _selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames()); TQStringList::ConstIterator it = descEncodings.constBegin(); @@ -84,7 +84,7 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox() TQString KexiCharacterEncodingComboBox::selectedEncoding() const { if (defaultEncodingSelected()) { - return TQString::tqfromLatin1(KGlobal::locale()->encoding()); + return TQString::fromLatin1(KGlobal::locale()->encoding()); } else { return KGlobal::charsets()->encodingForName( currentText() ); diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp index 20e85b04f..e06b084ba 100644 --- a/kexi/widget/kexicustompropertyfactory_p.cpp +++ b/kexi/widget/kexicustompropertyfactory_p.cpp @@ -50,7 +50,7 @@ void KexiImagePropertyEdit::selectPixmap() ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name()); TQString name = item ? item->pixmapName(property()->name()) : ""; - PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() ); + PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() ); if(dialog.exec() == TQDialog::Accepted) { setValue(dialog.pixmap(), true); item->setPixmapName(property()->name(), dialog.pixmapName()); diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 113f8be47..c6eb39d3d 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -59,9 +59,9 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti TQVBoxLayout *box = new TQVBoxLayout(this); box->addWidget(m_internalView); - setMinimumSize(m_internalView->tqminimumSizeHint().width(), - m_internalView->tqminimumSizeHint().height()); - resize( preferredSizeHint( m_internalView->tqsizeHint() ) ); + setMinimumSize(m_internalView->minimumSizeHint().width(), + m_internalView->minimumSizeHint().height()); + resize( preferredSizeHint( m_internalView->sizeHint() ) ); setFocusProxy(m_internalView); if (!noDataAware) { @@ -165,14 +165,14 @@ TQWidget* KexiDataAwareView::mainWidget() return m_internalView; } -TQSize KexiDataAwareView::tqminimumSizeHint() const +TQSize KexiDataAwareView::minimumSizeHint() const { - return m_internalView ? m_internalView->tqminimumSizeHint() : TQSize(0,0);//KexiViewBase::tqminimumSizeHint(); + return m_internalView ? m_internalView->minimumSizeHint() : TQSize(0,0);//KexiViewBase::minimumSizeHint(); } -TQSize KexiDataAwareView::tqsizeHint() const +TQSize KexiDataAwareView::sizeHint() const { - return m_internalView ? m_internalView->tqsizeHint() : TQSize(0,0);//KexiViewBase::tqsizeHint(); + return m_internalView ? m_internalView->sizeHint() : TQSize(0,0);//KexiViewBase::sizeHint(); } void KexiDataAwareView::updateActions(bool activated) diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h index 5cc76e974..8a787bd72 100644 --- a/kexi/widget/kexidataawareview.h +++ b/kexi/widget/kexidataawareview.h @@ -49,9 +49,9 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase, TQWidget* mainWidget(); - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; KexiDataAwareObjectInterface* dataAwareObject() const { return m_dataAwareObject; } diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp index 78b67c8d6..1f9006fda 100644 --- a/kexi/widget/kexidbconnectionwidget.cpp +++ b/kexi/widget/kexidbconnectionwidget.cpp @@ -95,7 +95,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent, const char* n hbox->addWidget( d->btnSaveChanges ); hbox->addSpacing( KDialogBase::spacingHint() ); TQWidget::setTabOrder(titleEdit, d->btnSaveChanges); - d->btnSaveChanges->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + d->btnSaveChanges->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); d->btnTestConnection = new KPushButton(KGuiItem(i18n("&Test Connection"), "", i18n("Test database connection"), @@ -103,7 +103,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent, const char* n frmBottom, "testConnection"); hbox->addWidget( d->btnTestConnection ); TQWidget::setTabOrder(d->btnSaveChanges, d->btnTestConnection); - d->btnTestConnection->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + d->btnTestConnection->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); connect( locationBGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotLocationBGrpClicked(int)) ); connect( chkPortDefault, TQT_SIGNAL(toggled(bool)), this , TQT_SLOT(slotCBToggled(bool)) ); diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui index 6dd4fbf8d..463d87976 100644 --- a/kexi/widget/kexidbconnectionwidgetbase.ui +++ b/kexi/widget/kexidbconnectionwidgetbase.ui @@ -39,7 +39,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>331</height> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -356,7 +356,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32767</height> @@ -411,7 +411,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui index f1f161deb..74b4326d3 100644 --- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui +++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>129</width> <height>20</height> diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp index 88b72596d..cd4be1b2f 100644 --- a/kexi/widget/kexidswelcome.cpp +++ b/kexi/widget/kexidswelcome.cpp @@ -37,7 +37,7 @@ KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent) KexiDSPixmap *pic = new KexiDSPixmap(this); TQLabel *lText = new TQLabel(i18n("Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""), this); - lText->tqsetAlignment(AlignTop | AlignLeft | WordBreak); + lText->setAlignment(AlignTop | AlignLeft | WordBreak); TQCheckBox *useWizard = new TQCheckBox(i18n("Create %1 using the \"%1 Wizard\""), this); connect(useWizard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setUseWizard(bool))); useWizard->setChecked(true); diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index 317950490..b9c64635f 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -243,7 +243,7 @@ void KexiFieldComboBox::focusOutEvent( TQFocusEvent *e ) { KComboBox::focusOutEvent( e ); // accept changes if the focus is moved - if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) //(a check needed because drop-down listbox also causes a focusout) + if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) //(a check needed because drop-down listbox also causes a focusout) slotReturnPressed(currentText()); } diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 532ec0574..7316caebb 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -117,7 +117,7 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema) } #if 0 -TQSize KexiFieldListView::tqsizeHint() +TQSize KexiFieldListView::sizeHint() { TQFontMetrics fm(font()); diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h index 50d94dbac..536824365 100644 --- a/kexi/widget/kexifieldlistview.h +++ b/kexi/widget/kexifieldlistview.h @@ -60,7 +60,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView TQStringList selectedFieldNames() const; // void setReadOnly(bool); -// virtual TQSize tqsizeHint(); +// virtual TQSize sizeHint(); signals: /*! Emitted when a field is double clicked */ diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index 02b050b84..122d95146 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -40,7 +40,7 @@ KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name) hlyr->addWidget(m_objectIconLabel); m_objectNameLabel = new TQLabel(this); m_objectNameLabel->setMargin(2); - m_objectNameLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); + m_objectNameLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); hlyr->addWidget(m_objectNameLabel); } @@ -125,7 +125,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget vlyr->addWidget(d->objectIcon); d->objectClassName = new TQLabel(this); d->objectClassName->setMargin(2); - d->objectClassName->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); + d->objectClassName->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); vlyr->addWidget(d->objectClassName);*/ d->editor = new KoProperty::Editor(this, true /*AutoSync*/, "propeditor"); @@ -146,14 +146,14 @@ KexiPropertyEditorView::~KexiPropertyEditorView() delete d; } -TQSize KexiPropertyEditorView::tqsizeHint() const +TQSize KexiPropertyEditorView::sizeHint() const { - return TQSize(200,200);//m_editor->tqsizeHint(); + return TQSize(200,200);//m_editor->sizeHint(); } -TQSize KexiPropertyEditorView::tqminimumSizeHint() const +TQSize KexiPropertyEditorView::minimumSizeHint() const { - return TQSize(200,200);//m_editor->tqsizeHint(); + return TQSize(200,200);//m_editor->sizeHint(); } /*void KexiPropertyEditorView::setGeometry ( const TQRect &r ) diff --git a/kexi/widget/kexipropertyeditorview.h b/kexi/widget/kexipropertyeditorview.h index 66cc0ac7e..008e6759d 100644 --- a/kexi/widget/kexipropertyeditorview.h +++ b/kexi/widget/kexipropertyeditorview.h @@ -99,8 +99,8 @@ class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public TQWidget KexiObjectInfoLabel *infoLabel, KoProperty::Set* set, const TQString& textToDisplayForNullSet = TQString()); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; KoProperty::Editor *editor() const; // public slots: diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index db9dbb14f..7bdfd12e3 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -52,7 +52,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview) , m_scrollViewNavPanel(0) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); - viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); + viewport()->setPaletteBackgroundColor(colorGroup().mid()); TQColor fc = tqpalette().active().foreground(), bc = viewport()->paletteBackgroundColor(); m_helpColor = KexiUtils::blendedColors(fc, bc, 1, 2); @@ -80,7 +80,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview) //! @todo allow to hide navigator updateScrollBars(); m_scrollViewNavPanel = new KexiRecordNavigator(this, leftMargin(), "nav"); - m_scrollViewNavPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred); + m_scrollViewNavPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred); } } diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 7e6989f36..65286fbd2 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -65,7 +65,7 @@ KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, d->lyr->setAutoAdd(true); d->lbl_b = new TQHBox(this); d->lbl = new TQLabel(TQString(" ")+caption, d->lbl_b); - d->lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); + d->lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); d->lbl->setFocusPolicy(TQ_StrongFocus); d->lbl->installEventFilter(this); installEventFilter(this); @@ -83,7 +83,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip, KPushButton *btn = new KPushButton(d->lbl_b); btn->setFlat(true); btn->setFocusPolicy(TQ_NoFocus); - btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); if (receiver && member) { connect(btn, TQT_SIGNAL(clicked()), receiver, member); } @@ -113,19 +113,19 @@ bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e ) void KexiSectionHeader::slotFocus(bool in) { - in = in || tqfocusWidget()==this; + in = in || focusWidget()==this; d->lbl->setPaletteBackgroundColor( in ? tqpalette().active().color(TQColorGroup::Highlight) : tqpalette().active().color(TQColorGroup::Background) ); d->lbl->setPaletteForegroundColor( in ? tqpalette().active().color(TQColorGroup::HighlightedText) : tqpalette().active().color(TQColorGroup::Foreground) ); } -TQSize KexiSectionHeader::tqsizeHint() const +TQSize KexiSectionHeader::sizeHint() const { if (!d->lyr->view) - return TQWidget::tqsizeHint(); - TQSize s = d->lyr->view->tqsizeHint(); - return TQSize(s.width(), d->lbl->tqsizeHint().height() + s.height()); + return TQWidget::sizeHint(); + TQSize s = d->lyr->view->sizeHint(); + return TQSize(s.width(), d->lbl->sizeHint().height() + s.height()); } /*void KexiSectionHeader::setFocus() diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h index 9ed31a35e..a8d08a450 100644 --- a/kexi/widget/kexisectionheader.h +++ b/kexi/widget/kexisectionheader.h @@ -41,7 +41,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget virtual bool eventFilter( TQObject *o, TQEvent *e ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void slotFocus(bool in); diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index 81bab0c62..237130f29 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -71,7 +71,7 @@ void KexiSmallToolButton::updateAction() void KexiSmallToolButton::init() { setPaletteBackgroundColor(tqpalette().active().background()); - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); TQFont f(KGlobalSettings::toolBarFont()); f.setPixelSize(Kexi::smallFont().pixelSize()); setFont(f); @@ -125,7 +125,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter ) if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter, - TQRect(width()-7, height()-7, 5, 5), tqcolorGroup(), + TQRect(width()-7, height()-7, 5, 5), colorGroup(), arrowFlags, TQStyleOption() ); } } diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index 0aeddca46..19875521c 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -159,7 +159,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent) // Name input TQLabel *name = new TQLabel(i18n("&Name:"), frame); l->addWidget(name, 0, 0); - name->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter); + name->setAlignment(TQt::AlignRight|TQt::AlignVCenter); m_nameInput = new KLineEdit("kexi", frame); l->addWidget(m_nameInput, 0, 1); name->setBuddy(m_nameInput); @@ -167,7 +167,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent) // Choose size TQLabel *size = new TQLabel(i18n("&Size:"), frame); l->addWidget(size, 1, 0); - size->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter); + size->setAlignment(TQt::AlignRight|TQt::AlignVCenter); KComboBox *combo = new KComboBox(frame); l->addWidget(combo, 1, 1); diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 18c19ef93..378d2580c 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -57,7 +57,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) // connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *))); - viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); + viewport()->setPaletteBackgroundColor(colorGroup().mid()); setFocusPolicy(TQ_WheelFocus); setResizePolicy(Manual); /*MOVED TO KexiRelationDialog @@ -94,7 +94,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) invalidateActions(); #endif - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true); } KexiRelationView::~KexiRelationView() @@ -146,13 +146,13 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect) addChild(c, 100,100); if (rect.isValid()) {//predefined size - TQSize finalSize = c->size().expandedTo( c->tqsizeHint() ); + TQSize finalSize = c->size().expandedTo( c->sizeHint() ); TQRect r = rect; r.setSize( finalSize + TQSize(0,10) ); moveChild( c, rect.left(), rect.top() ); //we're doing this instead of setGeometry(rect) //because the geomenty might be saved on other system with bigger fonts :) - c->resize(c->tqsizeHint()); + c->resize(c->sizeHint()); // c->setGeometry(r); //TODO @@ -164,7 +164,7 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect) updateGeometry(); if (!rect.isValid()) { c->updateGeometry(); - c->resize(c->tqsizeHint()); + c->resize(c->sizeHint()); } int x, y; @@ -584,9 +584,9 @@ void KexiRelationView::slotTableViewGotFocus() emit tableViewGotFocus(); } -TQSize KexiRelationView::tqsizeHint() const +TQSize KexiRelationView::sizeHint() const { - return TQSize(TQScrollView::tqsizeHint());//.width(), 600); + return TQSize(TQScrollView::sizeHint());//.width(), 600); } void KexiRelationView::clear() diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h index 6bc31b31e..404fbcbe9 100644 --- a/kexi/widget/relations/kexirelationview.h +++ b/kexi/widget/relations/kexirelationview.h @@ -96,7 +96,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView inline KexiRelationViewTableContainer* focusedTableView() const { return m_focusedTableView; } - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; const ConnectionList* connections() const { return &m_connectionViews; } diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp index c0635c1b7..ab3f1ac43 100644 --- a/kexi/widget/relations/kexirelationviewconnection.cpp +++ b/kexi/widget/relations/kexirelationviewconnection.cpp @@ -92,7 +92,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p) pa.setPoint(0, rx - 4, ry - 3); pa.setPoint(1, rx - 4, ry + 3); pa.setPoint(2, rx - 1, ry); - p->tqdrawPolygon(pa, true); + p->drawPolygon(pa, true); //master side p->drawLine(sx, sy - 1, sx + side1CharWidth -1, sy - 1); @@ -134,7 +134,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p) pa.setPoint(0, lx + 3, ry - 3); pa.setPoint(1, lx + 3, ry + 3); pa.setPoint(2, lx, ry); - p->tqdrawPolygon(pa, true); + p->drawPolygon(pa, true); // p->drawLine(lx, ry, lx + 8, ry); // p->drawPoint(lx + 1, ry - 1); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 55440da43..ea1682f77 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -61,18 +61,18 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( m_tableHeader = new KexiRelationViewTableContainerHeader(schema->name(), this); m_tableHeader->unsetFocus(); - m_tableHeader->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + m_tableHeader->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); lyr->addWidget(m_tableHeader); connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved())); connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag())); m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable"); //m_tableHeader->setFocusProxy( m_tableView ); - m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + m_tableView->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); - m_tableView->setMaximumSize( m_tableView->tqsizeHint() ); + m_tableView->setMaximumSize( m_tableView->sizeHint() ); -// m_tableView->resize( m_tableView->tqsizeHint() ); +// m_tableView->resize( m_tableView->sizeHint() ); lyr->addWidget(m_tableView, 0); connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved())); connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), @@ -110,13 +110,13 @@ int KexiRelationViewTableContainer::globalY(const TQString &field) } #if 0//js -TQSize KexiRelationViewTableContainer::tqsizeHint() +TQSize KexiRelationViewTableContainer::sizeHint() { #ifdef TQ_WS_WIN - TQSize s = m_tableView->tqsizeHint() + TQSize s = m_tableView->sizeHint() + TQSize( 2 * 5 , m_tableHeader->height() + 2 * 5 ); #else - TQSize s = m_tableView->tqsizeHint(); + TQSize s = m_tableView->sizeHint(); s.setWidth(s.width() + 4); s.setHeight(m_tableHeader->height() + s.height()); #endif @@ -307,7 +307,7 @@ KexiRelationViewTable::~KexiRelationViewTable() { } -TQSize KexiRelationViewTable::tqsizeHint() const +TQSize KexiRelationViewTable::sizeHint() const { TQFontMetrics fm(fontMetrics()); @@ -341,7 +341,7 @@ KexiRelationViewTable::globalY(const TQString &item) TQListViewItem *i = findItem(item, 0); if (!i) return -1; - int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2); + int y = itemRect(i).y() + (itemRect(i).height() / 2); if (contentsY() > itemPos(i)) y = 0; else if (y == 0) @@ -420,10 +420,10 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item) { if (painter) { - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, tqitemRect(item), tqcolorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(), TQStyle::Style_FocusAtBorder); } - return tqitemRect(item); + return itemRect(item); } #include "kexirelationviewtable.moc" diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h index 5c622dad1..6578cdd53 100644 --- a/kexi/widget/relations/kexirelationviewtable.h +++ b/kexi/widget/relations/kexirelationviewtable.h @@ -105,7 +105,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView // KexiDB::TableSchema *table() const { return m_table; }; int globalY(const TQString &item); // void setReadOnly(bool); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: void tableScrolling(); diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 4b9521637..4c5754b5c 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -59,7 +59,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, m_tableCombo->setInsertionPolicy(TQComboBox::NoInsertion); hlyr->addWidget(lbl); hlyr->addWidget(m_tableCombo); - m_tableCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred)); + m_tableCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred)); fillTablesCombo(); m_btnAdd = new KPushButton(i18n("&Add"), this); @@ -302,9 +302,9 @@ void KexiRelationWidget::designSelectedTable() Kexi::DesignViewMode, openingCancelled); } -TQSize KexiRelationWidget::tqsizeHint() const +TQSize KexiRelationWidget::sizeHint() const { - return m_relationView->tqsizeHint(); + return m_relationView->sizeHint(); } void KexiRelationWidget::slotTableHidden(KexiDB::TableSchema &table) diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h index 39ac549a9..713ce8fc4 100644 --- a/kexi/widget/relations/kexirelationwidget.h +++ b/kexi/widget/relations/kexirelationwidget.h @@ -60,7 +60,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase // void openTable(KexiDB::TableSchema* table, bool designMode); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /*! Used to add newly created object information to the combo box. */ void objectCreated(const TQCString &mime, const TQCString& name); diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 7ad76c341..c818606d7 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -559,7 +559,7 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ s = TQMIN( h-3, s ); s = TQMIN( w-3, s );//avoid too large box TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s); - p->setPen(TQPen(tqcolorGroup().text(), 1)); + p->setPen(TQPen(colorGroup().text(), 1)); p->drawRect(r); if (val.asBool()) { p->drawLine(r.x(), r.y(), r.right(), r.bottom()); diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp index 8f199b5d1..c0753269e 100644 --- a/kexi/widget/tableview/kexibooltableedit.cpp +++ b/kexi/widget/tableview/kexibooltableedit.cpp @@ -105,7 +105,7 @@ void KexiBoolTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria s = TQMIN( h-3, s ); s = TQMIN( w-3, s );//avoid too large box TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s); -//already set ouotside: p->setPen(TQPen(tqcolorGroup().text(), 1)); +//already set ouotside: p->setPen(TQPen(colorGroup().text(), 1)); p->drawRect(r); if (val.isNull()) { // && !field()->isNotNull()) { p->drawText( r, TQt::AlignCenter, "?" ); diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp index 6a2feec87..9ecae92f7 100644 --- a/kexi/widget/tableview/kexicomboboxpopup.cpp +++ b/kexi/widget/tableview/kexicomboboxpopup.cpp @@ -56,8 +56,8 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView a.rowHighlightingEnabled = true; a.rowMouseOverHighlightingEnabled = true; a.persistentSelections = false; - a.rowMouseOverHighlightingColor = tqcolorGroup().highlight(); - a.rowMouseOverHighlightingTextColor = tqcolorGroup().highlightedText(); + a.rowMouseOverHighlightingColor = colorGroup().highlight(); + a.rowMouseOverHighlightingTextColor = colorGroup().highlightedText(); a.rowHighlightingTextColor = a.rowMouseOverHighlightingTextColor; a.gridEnabled = false; setAppearance(a); @@ -68,7 +68,7 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView setContextMenuEnabled( false ); setScrollbarToolTipsEnabled( false ); installEventFilter(this); - setBottomMarginInternal( - horizontalScrollBar()->tqsizeHint().height() ); + setBottomMarginInternal( - horizontalScrollBar()->sizeHint().height() ); } virtual void setData( KexiTableViewData *data, bool owner = true ) { KexiTableView::setData( data, owner ); } diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 3ae979744..37ababa52 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -80,7 +80,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg // m_lineedit->setFrameStyle( TQFrame::Plain | TQFrame::Box ); // m_lineedit->setLineWidth( 1 ); // if (f.isNumericType()) { -// m_lineedit->tqsetAlignment(AlignRight); +// m_lineedit->setAlignment(AlignRight); // } // setView( m_lineedit ); diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index 79613d9db..721cb2d89 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -84,7 +84,7 @@ KexiDataAwareObjectInterface::KexiDataAwareObjectInterface() m_scrollBarTip->setPalette(TQToolTip::palette()); m_scrollBarTip->setMargin(2); m_scrollBarTip->setIndent(0); - m_scrollBarTip->tqsetAlignment(TQt::AlignCenter); + m_scrollBarTip->setAlignment(TQt::AlignCenter); m_scrollBarTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); m_scrollBarTip->setLineWidth(1); @@ -1950,7 +1950,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c if (firstCharacter != -1 && firstCharacter != 0) { //we're not at 0-th char firstCharacter = -1; } - else if (where.tqstartsWith(stringValue, caseSensitive)) { + else if (where.startsWith(stringValue, caseSensitive)) { if (wholeWordsOnly) { // If where.length() < stringValue.length(), true will be returned too - fine. return !where.at( stringValue.length() ).isLetterOrNumber(); diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp index 257cf0aae..dde99b31a 100644 --- a/kexi/widget/tableview/kexidataawarepropertyset.cpp +++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp @@ -92,10 +92,10 @@ uint KexiDataAwarePropertySet::size() const return m_sets.size(); } -void KexiDataAwarePropertySet::clear(uint tqminimumSize) +void KexiDataAwarePropertySet::clear(uint minimumSize) { m_sets.clear(); - m_sets.resize(TQMAX(tqminimumSize, MAX_FIELDS)); + m_sets.resize(TQMAX(minimumSize, MAX_FIELDS)); m_view->setDirty(true); m_view->propertySetSwitched(); } diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h index e24fbd8a8..b2c66f960 100644 --- a/kexi/widget/tableview/kexidataawarepropertyset.h +++ b/kexi/widget/tableview/kexidataawarepropertyset.h @@ -97,7 +97,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject public slots: void removeCurrentPropertySet(); - void clear(uint tqminimumSize = 0); + void clear(uint minimumSize = 0); /*! Inserts \a set property set at \a row position. If there was a buffer at this position before, it will be destroyed. diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp index 1b834fe90..36b662f9e 100644 --- a/kexi/widget/tableview/kexiinputtableedit.cpp +++ b/kexi/widget/tableview/kexiinputtableedit.cpp @@ -47,7 +47,7 @@ class MyLineEdit : public KLineEdit {} protected: virtual void drawFrame ( TQPainter * p ) { - p->setPen( TQPen( tqcolorGroup().text() ) ); + p->setPen( TQPen( colorGroup().text() ) ); TQRect r = rect(); p->moveTo( r.topLeft() ); p->lineTo( r.topRight() ); @@ -100,7 +100,7 @@ void KexiInputTableEdit::init() m_lineedit = new MyLineEdit(this, "KexiInputTableEdit-KLineEdit"); setViewWidget(m_lineedit); if (align_right) - m_lineedit->tqsetAlignment(AlignRight); + m_lineedit->setAlignment(AlignRight); // m_cview->setFrame(false); // m_cview->setFrameStyle( TQFrame::Plain | TQFrame::Box ); // m_cview->setLineWidth( 1 ); @@ -222,7 +222,7 @@ TQString KexiInputTableEdit::valueToText(KexiDB::Field* field, const TQVariant& void KexiInputTableEdit::paintEvent ( TQPaintEvent * /*e*/ ) { TQPainter p(this); - p.setPen( TQPen( tqcolorGroup().text() ) ); + p.setPen( TQPen( colorGroup().text() ) ); p.drawRect( rect() ); } diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 4ed993cda..35ad23699 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -102,10 +102,10 @@ class KexiTableView::WhatsThis : public TQWhatsThis const int leftMargin = m_tv->verticalHeaderVisible() ? m_tv->verticalHeader()->width() : 0; //const int topMargin = m_tv->horizontalHeaderVisible() ? m_tv->d->pTopHeader->height() : 0; //const int bottomMargin = m_tv->d->appearance.navigatorEnabled ? m_tv->m_navPanel->height() : 0; - if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) { + if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->childAt(pos)))) { return i18n("Contains a pointer to the currently selected row"); } - else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) { + else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->childAt(pos)))) { return i18n("Row navigator"); // return TQWhatsThis::textFor(m_tv->m_navPanel, TQPoint( pos.x(), pos.y() - m_tv->height() + bottomMargin )); } @@ -204,8 +204,8 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch setBackgroundMode(TQt::PaletteBackground); // setEmptyAreaColor(d->appearance.baseColor);//palette().active().color(TQColorGroup::Base)); -// d->baseColor = tqcolorGroup().base(); -// d->textColor = tqcolorGroup().text(); +// d->baseColor = colorGroup().base(); +// d->textColor = colorGroup().text(); // d->altColor = KGlobalSettings::alternateBackgroundColor(); // d->grayColor = TQColor(200,200,200); @@ -253,8 +253,8 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch m_verticalHeader->setCurrentRow(-1); setMargins( - TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight), - m_horizontalHeader->tqsizeHint().height(), 0, 0); + TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight), + m_horizontalHeader->sizeHint().height(), 0, 0); setupNavigator(); @@ -288,7 +288,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch // horizontalScrollBar()->show(); updateScrollBars(); -// resize(tqsizeHint()); +// resize(sizeHint()); // updateContents(); // setMinimumHeight(horizontalScrollBar()->height() + d->rowHeight + topMargin()); @@ -333,7 +333,7 @@ void KexiTableView::setupNavigator() m_navPanel = new KexiRecordNavigator(this, leftMargin(), "navPanel"); m_navPanel->setRecordHandler(this); - m_navPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred); + m_navPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred); } void KexiTableView::initDataContents() @@ -399,8 +399,8 @@ void KexiTableView::updateFonts(bool tqrepaint) // if(d->rowHeight < 22) // d->rowHeight = 22; setMargins( - TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight), - m_horizontalHeader->tqsizeHint().height(), 0, 0); + TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight), + m_horizontalHeader->sizeHint().height(), 0, 0); // setMargins(14, d->rowHeight, 0, 0); m_verticalHeader->setCellHeight(d->rowHeight); @@ -494,29 +494,29 @@ TQSizePolicy KexiTableView::sizePolicy() const return TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); } -TQSize KexiTableView::tqsizeHint() const +TQSize KexiTableView::sizeHint() const { const TQSize &ts = tableSize(); - int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->tqsizeHint().width() + 2*2, + int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->sizeHint().width() + 2*2, (m_navPanel->isVisible() ? m_navPanel->width() : 0) ); - int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), - tqminimumSizeHint().height() ); + int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), + minimumSizeHint().height() ); w = TQMIN( w, tqApp->desktop()->width()*3/4 ); //stretch h = TQMIN( h, tqApp->desktop()->height()*3/4 ); //stretch -// kexidbg << "KexiTableView::tqsizeHint()= " <<w <<", " <<h << endl; +// kexidbg << "KexiTableView::sizeHint()= " <<w <<", " <<h << endl; return TQSize(w, h); /*TQSize( TQMAX( ts.width() + leftMargin() + 2*2, (m_navPanel ? m_navPanel->width() : 0) ), //+ TQMIN(m_verticalHeader->width(),d->rowHeight) + margin()*2, - TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), - tqminimumSizeHint().height() ) + TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), + minimumSizeHint().height() ) );*/ -// TQMAX(ts.height() + topMargin(), tqminimumSizeHint().height()) ); +// TQMAX(ts.height() + topMargin(), minimumSizeHint().height()) ); } -TQSize KexiTableView::tqminimumSizeHint() const +TQSize KexiTableView::minimumSizeHint() const { return TQSize( leftMargin() + ((columns()>0)?columnWidth(0):KEXI_DEFAULT_DATA_COLUMN_WIDTH) + 2*2, @@ -658,7 +658,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch) if(d->pBufferPm->isNull()) return; TQPainter *pb = new TQPainter(d->pBufferPm, this); -// pb->fillRect(0, 0, cw, ch, tqcolorGroup().base()); +// pb->fillRect(0, 0, cw, ch, colorGroup().base()); // int maxwc = TQMIN(cw, (columnPos(d->numCols - 1) + columnWidth(d->numCols - 1))); int maxwc = columnPos(columns() - 1) + columnWidth(columns() - 1); @@ -812,7 +812,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro && !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted && usesSelectedTextColor) { - defaultPen = TQPen(tqcolorGroup().highlightedText()); //selected text + defaultPen = TQPen(colorGroup().highlightedText()); //selected text } else if (d->appearance.rowHighlightingEnabled && row == m_curRow && !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted @@ -849,7 +849,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro if (m_currentItem == item && (col == m_curCol || d->appearance.fullRowSelection)) { if (edit && ((d->appearance.rowHighlightingEnabled && !d->appearance.fullRowSelection) || (row == m_curRow && d->highlightedRow==-1 && d->appearance.fullRowSelection))) //!dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted) edit->paintSelectionBackground( p, isEnabled(), txt, align, x, y_offset, w, h, - isEnabled() ? tqcolorGroup().highlight() : TQColor(200,200,200),//d->grayColor, + isEnabled() ? colorGroup().highlight() : TQColor(200,200,200),//d->grayColor, p->fontMetrics(), columnReadOnly, d->appearance.fullRowSelection ); } @@ -945,15 +945,15 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch // Subtract the table from it // reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts-TQSize(0,m_navPanel->isVisible() ? m_navPanel->height() : 0) ) ); reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts - -TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->tqsizeHint().height()) - - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0) + -TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->sizeHint().height()) + - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0) + (horizontalScrollBar()->isVisible() ? 0 : d->internal_bottomMargin -// horizontalScrollBar()->tqsizeHint().height()/2 +// horizontalScrollBar()->sizeHint().height()/2 ) -//- /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2 +//- /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2 + contentsY() -// - (verticalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0) +// - (verticalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0) ) ) ); // reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts ) ); @@ -1261,7 +1261,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e) const int k = e->key(); const bool ro = isReadOnly(); - TQWidget *w = tqfocusWidget(); + TQWidget *w = focusWidget(); // if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view() && w!=m_editor)) { // if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view())) { if (!w || TQT_BASE_OBJECT(w)!=TQT_BASE_OBJECT(viewport()) && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQT_BASE_OBJECT_NAME*>(m_editor)), TQT_TQOBJECT(w)))) { @@ -1636,10 +1636,10 @@ void KexiTableView::resizeEvent(TQResizeEvent *e) /* m_navPanel->setGeometry( frameWidth(), viewport()->height() +d->pTopHeader->height() - -(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height()) + -(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height()) +frameWidth(), - m_navPanel->tqsizeHint().width(), // - verticalScrollBar()->tqsizeHint().width() - horizontalScrollBar()->tqsizeHint().width(), - horizontalScrollBar()->tqsizeHint().height() + m_navPanel->sizeHint().width(), // - verticalScrollBar()->sizeHint().width() - horizontalScrollBar()->sizeHint().width(), + horizontalScrollBar()->sizeHint().height() );*/ // updateContents(); // m_navPanel->setGeometry(1,horizontalScrollBar()->pos().y(), @@ -1923,42 +1923,42 @@ TQSize KexiTableView::tableSize() const if ((rows()+ (isInsertingEnabled()?1:0) ) > 0 && columns() > 0) { /* kexidbg << "tableSize()= " << columnPos( columns() - 1 ) + columnWidth( columns() - 1 ) << ", " << rowPos( rows()-1+(isInsertingEnabled()?1:0)) + d->rowHeight -// + TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->tqsizeHint().height()) - + (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 ) +// + TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->sizeHint().height()) + + (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 ) + margin() << endl; */ // kexidbg<< m_navPanel->isVisible() <<" "<<m_navPanel->height()<<" " -// <<horizontalScrollBar()->tqsizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl; +// <<horizontalScrollBar()->sizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl; - //int xx = horizontalScrollBar()->tqsizeHint().height()/2; + //int xx = horizontalScrollBar()->sizeHint().height()/2; TQSize s( columnPos( columns() - 1 ) + columnWidth( columns() - 1 ), -// + verticalScrollBar()->tqsizeHint().width(), +// + verticalScrollBar()->sizeHint().width(), rowPos( rows()-1+(isInsertingEnabled()?1:0) ) + d->rowHeight - + (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height()) + + (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height()) + d->internal_bottomMargin -// horizontalScrollBar()->tqsizeHint().height()/2 -// - /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2 +// horizontalScrollBar()->sizeHint().height()/2 +// - /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2 // + ( (m_navPanel && m_navPanel->isVisible() && verticalScrollBar()->isVisible() // && !horizontalScrollBar()->isVisible()) - // ? horizontalScrollBar()->tqsizeHint().height() : 0) + // ? horizontalScrollBar()->sizeHint().height() : 0) // + TQMAX( (m_navPanel && m_navPanel->isVisible()) ? m_navPanel->height() : 0, -// horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() : 0) +// horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() : 0) // + (m_navPanel->isVisible() -// ? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 ) +// ? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 ) -// - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() :0 ) +// - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() :0 ) + margin() //-2*d->rowHeight ); // kexidbg << rows()-1 <<" "<< (isInsertingEnabled()?1:0) <<" "<< (m_rowEditing?1:0) << " " << s << endl; return s; -// +horizontalScrollBar()->tqsizeHint().height() + margin() ); +// +horizontalScrollBar()->sizeHint().height() + margin() ); } return TQSize(0,0); } @@ -2271,13 +2271,13 @@ void KexiTableView::setVerticalHeaderVisible(bool set) int left_width; if (set) { m_verticalHeader->show(); - left_width = TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight); + left_width = TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight); } else { m_verticalHeader->hide(); left_width = 0; } - setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->tqsizeHint().height() : 0, 0, 0); + setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->sizeHint().height() : 0, 0, 0); } bool KexiTableView::horizontalHeaderVisible() const @@ -2291,7 +2291,7 @@ void KexiTableView::setHorizontalHeaderVisible(bool set) d->horizontalHeaderVisible = set; //needed because isVisible() is not always accurate if (set) { m_horizontalHeader->show(); - top_height = m_horizontalHeader->tqsizeHint().height(); + top_height = m_horizontalHeader->sizeHint().height(); } else { m_horizontalHeader->hide(); @@ -2478,7 +2478,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e ) } /* else if (e->type()==TQEvent::FocusOut && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) { //hp==true if currently focused widget is a child of this table view - const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), tqfocusWidget()); + const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget()); if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) { //accept row editing if focus is moved to foreign widget //(not a child, like eg. editor) from one of our table view's tqchildren @@ -2531,8 +2531,8 @@ void KexiTableView::setAppearance(const Appearance& a) m_verticalHeader->setCellHeight(d->rowHeight); if (m_horizontalHeader) { setMargins( - TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight), - m_horizontalHeader->tqsizeHint().height(), 0, 0); + TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight), + m_horizontalHeader->sizeHint().height(), 0, 0); } // } if (a.rowHighlightingEnabled) diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h index 9cfcf47e0..daabe0f94 100644 --- a/kexi/widget/tableview/kexitableview.h +++ b/kexi/widget/tableview/kexitableview.h @@ -223,8 +223,8 @@ public: // reimplemented for internal reasons virtual TQSizePolicy sizePolicy() const; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; /*! Reimplemented to update cached fonts and row sizes for the painter. */ void setFont(const TQFont &f); diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp index d5e1641ae..983378cb2 100644 --- a/kexi/widget/tableview/kexitableview_p.cpp +++ b/kexi/widget/tableview/kexitableview_p.cpp @@ -48,7 +48,7 @@ KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t) //moved scrollBarTipTimerCnt = 0; //moved scrollBarTip = 0; ensureCellVisibleOnShow = TQPoint(-1,-1); - internal_bottomMargin = tv->horizontalScrollBar()->tqsizeHint().height()/2; + internal_bottomMargin = tv->horizontalScrollBar()->sizeHint().height()/2; highlightedRow = -1; moveCursorOnMouseRelease = false; horizontalHeaderVisible = true; diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp index 5905706b1..ad670e3e6 100644 --- a/kexi/widget/tableview/kexitableviewdata.cpp +++ b/kexi/widget/tableview/kexitableviewdata.cpp @@ -822,7 +822,7 @@ void KexiTableViewData::clearInternal() removeLast(); #ifndef KEXI_NO_PROCESS_EVENTS if (i % 1000 == 0) - tqApp->tqprocessEvents( 1 ); + tqApp->processEvents( 1 ); #endif } } @@ -873,7 +873,7 @@ void KexiTableViewData::preloadAllRows() m_cursor->moveNext(); #ifndef KEXI_NO_PROCESS_EVENTS if ((i % 1000) == 0) - tqApp->tqprocessEvents( 1 ); + tqApp->processEvents( 1 ); #endif } } diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp index 4a00be38c..d217337b7 100644 --- a/kexi/widget/tableview/kexitableviewheader.cpp +++ b/kexi/widget/tableview/kexitableviewheader.cpp @@ -126,7 +126,7 @@ bool KexiTableViewHeader::eventFilter(TQObject * watched, TQEvent * e) TQString tip = m_toolTips[ section ]; if (tip.isEmpty()) { //try label TQFontMetrics fm(font()); - int minWidth = fm.width( label( section ) ) + tqstyle().tqpixelMetric( TQStyle::PM_HeaderMargin ); + int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin ); TQIconSet *iset = iconSet( section ); if (iset) minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint() diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp index 777fea1bf..60f99f85c 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp @@ -53,18 +53,18 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p) TQRect r = rect(); r.setHeight(r.height()+m_fixForHeight); - if (m_tqdrawComplexControl) { + if (m_drawComplexControl) { if (m_fixForHeight>0 && m_paintedCombo->size()!=size()) { m_paintedCombo->move(0,0); m_paintedCombo->setFixedSize(size()+TQSize(0, m_fixForHeight)); //last chance to fix size } - tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, p, - m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, tqcolorGroup(), + tqstyle().drawComplexControl( TQStyle::CC_ComboBox, p, + m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, colorGroup(), flags, (uint)(TQStyle::SC_ComboBoxArrow), TQStyle::SC_None ); } else { r.setWidth(r.width()+2); - tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, tqcolorGroup(), flags); + tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags); } } @@ -77,7 +77,7 @@ void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle ) else m_fixForHeight = 0; //</hack> - m_tqdrawComplexControl = + m_drawComplexControl = (tqstyle().inherits("KStyle") && qstricmp(tqstyle().name(),"qtcurve")!=0) || qstricmp(tqstyle().name(),"platinum")==0; if (m_fixForHeight==0) diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.h b/kexi/widget/utils/kexicomboboxdropdownbutton.h index f480de742..94c264844 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.h +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.h @@ -41,7 +41,7 @@ class KEXIGUIUTILS_EXPORT KexiComboBoxDropDownButton : public KPushButton virtual void styleChange( TQStyle & oldStyle ); int m_fixForHeight; - bool m_tqdrawComplexControl : 1; + bool m_drawComplexControl : 1; KComboBox *m_paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle //!< (because styles use \<static_cast\>) }; diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index 3c6b22f06..f34864a98 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -96,7 +96,7 @@ KexiImageContextMenu::~KexiImageContextMenu() void KexiImageContextMenu::insertFromFile() { -// TQWidget *tqfocusWidget = tqApp->tqfocusWidget(); +// TQWidget *focusWidget = tqApp->focusWidget(); #ifdef TQ_WS_WIN TQString recentDir; TQString fileName = TQFileDialog::getOpenFileName( @@ -116,8 +116,8 @@ void KexiImageContextMenu::insertFromFile() if (!url.isValid()) { //focus the app again because to avoid annoying the user with unfocused main window if (tqApp->mainWidget()) { - //tqfocusWidget->raise(); - //tqfocusWidget->setFocus(); + //focusWidget->raise(); + //focusWidget->setFocus(); tqApp->mainWidget()->raise(); } return; @@ -133,8 +133,8 @@ void KexiImageContextMenu::insertFromFile() emit insertFromFileRequested(url); if (tqApp->mainWidget()) { -// tqfocusWidget->raise(); -// tqfocusWidget->setFocus(); +// focusWidget->raise(); +// focusWidget->setFocus(); tqApp->mainWidget()->raise(); } } diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 718fcbf6a..b11961d2d 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -294,20 +294,20 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const TQString s(m_outputFormat); if (m_24h) { if (m_hoursWithLeadingZero) - s.replace( "%H", TQString::tqfromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) ); + s.replace( "%H", TQString::fromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) ); else s.replace( "%k", TQString::number(time.hour()) ); } else { int time12 = (time.hour()>12) ? (time.hour()-12) : time.hour(); if (m_hoursWithLeadingZero) - s.replace( "%I", TQString::tqfromLatin1(time12<10 ? "0" : "") + TQString::number(time12) ); + s.replace( "%I", TQString::fromLatin1(time12<10 ? "0" : "") + TQString::number(time12) ); else s.replace( "%l", TQString::number(time12) ); } - s.replace( "%M", TQString::tqfromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) ); + s.replace( "%M", TQString::fromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) ); if (m_secpos>=0) - s.replace( "%S", TQString::tqfromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) ); + s.replace( "%S", TQString::fromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) ); if (m_ampmpos>=0) s.replace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") ); return s; diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index 909d507ca..054192ce7 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -28,7 +28,7 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent) : TQToolButton(parent, "KexiDBImageBox::Button") { - tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); //! @todo get this from a KStyle // setFixedWidth(TQMAX(18, tqApp->globalStrut().width())); int fixedWidth; @@ -55,11 +55,11 @@ void KexiDropDownButton::drawButton( TQPainter *p ) if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, - TQRect((width()-7)/2, height()-9, 7, 7), tqcolorGroup(), + TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } -TQSize KexiDropDownButton::tqsizeHint () const +TQSize KexiDropDownButton::sizeHint () const { return TQSize( fontMetrics().maxWidth() + 2*2, fontMetrics().height()*2 + 2*2 ); } diff --git a/kexi/widget/utils/kexidropdownbutton.h b/kexi/widget/utils/kexidropdownbutton.h index e61ab9f5c..178f17a72 100644 --- a/kexi/widget/utils/kexidropdownbutton.h +++ b/kexi/widget/utils/kexidropdownbutton.h @@ -38,7 +38,7 @@ class KEXIGUIUTILS_EXPORT KexiDropDownButton : public TQToolButton virtual void drawButton( TQPainter *p ); - virtual TQSize tqsizeHint () const; + virtual TQSize sizeHint () const; virtual void keyPressEvent ( TQKeyEvent * e ); }; diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp index e4bc4207e..50959770c 100644 --- a/kexi/widget/utils/kexiflowlayout.cpp +++ b/kexi/widget/utils/kexiflowlayout.cpp @@ -137,7 +137,7 @@ void KexiFlowLayout::tqinvalidate() { TQLayout::tqinvalidate(); - m_cached_tqsizeHint = TQSize(); + m_cached_sizeHint = TQSize(); m_cached_minSize = TQSize(); m_cached_width = 0; } @@ -169,22 +169,22 @@ KexiFlowLayout::heightForWidth(int w) const } TQSize -KexiFlowLayout::tqsizeHint() const +KexiFlowLayout::sizeHint() const { - if(m_cached_tqsizeHint.isEmpty()) { + if(m_cached_sizeHint.isEmpty()) { KexiFlowLayout *mthis = (KexiFlowLayout*)this; TQRect r = TQRect(0, 0, 2000, 2000); mthis->simulateLayout(r); } - return m_cached_tqsizeHint; + return m_cached_sizeHint; } TQSize -KexiFlowLayout::tqminimumSize() const +KexiFlowLayout::minimumSize() const { //js: do we really need to simulate tqlayout here? // I commented this out because it was impossible to stretch tqlayout conveniently. -// Now, minimum size is computed automatically based on item's tqminimumSize... +// Now, minimum size is computed automatically based on item's minimumSize... #if 0 if(m_cached_minSize.isEmpty()) { KexiFlowLayout *mthis = (KexiFlowLayout*)this; @@ -234,7 +234,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) TQPtrListIterator<TQLayoutItem> it(m_list); TQPtrList<TQLayoutItem> currentLine; TQLayoutItem *o; - TQSize minSize, tqsizeHint(20, 20); + TQSize minSize, sizeHint(20, 20); int minSizeHeight = 0 - spacing(); while ( (o = it.current()) != 0 ) { @@ -244,7 +244,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) } // kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl; - TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) + TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) if ((x + oSizeHint.width()) > r.right() && h > 0) { // do the tqlayout of current line TQPtrListIterator<TQLayoutItem> it2(currentLine); @@ -252,12 +252,12 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) int wx = r.x(); int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0; while( (item = it2.current()) != 0 ) { - TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take - TQSize itemMinSize = item->tqminimumSize(); // a while to get them + TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take + TQSize itemMinSize = item->minimumSize(); // a while to get them TQSize s; if(m_justify) { if(expandingWidgets != 0) { - if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections) + if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections) s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets , r.width()), itemSizeHint.height() ); else @@ -277,7 +277,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, 0) ); + sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, 0) ); minSize = minSize.expandedTo( TQSize(minSizeWidth, 0) ); minSizeHeight = minSizeHeight + spacing() + lineMinHeight; // start a new line @@ -292,7 +292,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) x = x + spacing() + oSizeHint.width(); h = TQMAX( h, oSizeHint.height() ); currentLine.append(o); - if(o->expandingDirections() == TQSizePolicy::Horizontally || o->expandingDirections() == TQSizePolicy::BothDirections) + if(o->expanding() == TQSizePolicy::Horizontally || o->expanding() == TQSizePolicy::BothDirections) ++expandingWidgets; availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.width()); ++it; @@ -304,12 +304,12 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) int wx = r.x(); int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0; while( (item = it2.current()) != 0 ) { - TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take - TQSize itemMinSize = item->tqminimumSize(); // a while to get them + TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take + TQSize itemMinSize = item->minimumSize(); // a while to get them TQSize s; if(m_justify) { if(expandingWidgets != 0) { - if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections) + if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections) s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets , r.width()), itemSizeHint.height() ); else @@ -329,12 +329,12 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) ); + sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) ); minSizeHeight = minSizeHeight + spacing() + lineMinHeight; minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) ); - // store tqsizeHint() and tqminimumSize() - m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin()); + // store sizeHint() and minimumSize() + m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin()); m_cached_minSize = minSize + TQSize(2* margin() , 2*margin()); // return our height return y + h - r.y(); @@ -351,7 +351,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) TQPtrListIterator<TQLayoutItem> it(m_list); TQPtrList<TQLayoutItem> currentLine; TQLayoutItem *o; - TQSize minSize, tqsizeHint(20, 20); + TQSize minSize, sizeHint(20, 20); int minSizeWidth = 0 - spacing(); while ( (o = it.current()) != 0 ) { @@ -360,7 +360,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) continue; } - TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) + TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) if (y + oSizeHint.height() > r.bottom() && w > 0) { // do the tqlayout of current line TQPtrListIterator<TQLayoutItem> it2(currentLine); @@ -368,12 +368,12 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) int wy = r.y(); int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0; while( (item = it2.current()) != 0 ) { - TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take - TQSize itemMinSize = item->tqminimumSize(); // a while to get them + TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take + TQSize itemMinSize = item->minimumSize(); // a while to get them TQSize s; if(m_justify) { if(expandingWidgets != 0) { - if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections) + if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections) s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets , r.height()) ); else @@ -393,7 +393,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) colMinWidth = TQMAX( colMinWidth, itemMinSize.width() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize(0, sizeHintHeight) ); + sizeHint = sizeHint.expandedTo( TQSize(0, sizeHintHeight) ); minSize = minSize.expandedTo( TQSize(0, minSizeHeight) ); minSizeWidth = minSizeWidth + spacing() + colMinWidth; // start a new column @@ -408,7 +408,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) y = y + spacing() + oSizeHint.height(); w = TQMAX( w, oSizeHint.width() ); currentLine.append(o); - if(o->expandingDirections() == TQSizePolicy::Vertically || o->expandingDirections() == TQSizePolicy::BothDirections) + if(o->expanding() == TQSizePolicy::Vertically || o->expanding() == TQSizePolicy::BothDirections) ++expandingWidgets; availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.height()); ++it; @@ -420,12 +420,12 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) int wy = r.y(); int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0; while( (item = it2.current()) != 0 ) { - TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take - TQSize itemMinSize = item->tqminimumSize(); // a while to get them + TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take + TQSize itemMinSize = item->minimumSize(); // a while to get them TQSize s; if(m_justify) { if(expandingWidgets != 0) { - if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections) + if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections) s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets , r.height()) ); else @@ -445,12 +445,12 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) colMinWidth = TQMAX( colMinWidth, itemMinSize.width() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) ); + sizeHint = sizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) ); minSizeWidth = minSizeWidth + spacing() + colMinWidth; minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) ); - // store tqsizeHint() and tqminimumSize() - m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin()); + // store sizeHint() and minimumSize() + m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin()); m_cached_minSize = minSize + TQSize(2* margin(), 2*margin()); // return our width return x + w - r.x(); diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h index 0f6d83845..c4550fcab 100644 --- a/kexi/widget/utils/kexiflowlayout.h +++ b/kexi/widget/utils/kexiflowlayout.h @@ -53,8 +53,8 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout virtual bool hasHeightForWidth() const; virtual int heightForWidth(int width) const; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSize() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSize() const; virtual TQSizePolicy::ExpandData expanding() const; virtual bool isEmpty(); @@ -75,7 +75,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout int m_cached_hfw; bool m_justify; Qt::Orientation m_orientation; - TQSize m_cached_tqsizeHint; + TQSize m_cached_sizeHint; TQSize m_cached_minSize; }; diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp index b22e0500d..e3e281e3b 100644 --- a/kexi/widget/utils/kexirecordmarker.cpp +++ b/kexi/widget/utils/kexirecordmarker.cpp @@ -188,13 +188,13 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e) if(last > (d->rows-1+(d->showInsertRow?1:0))) last = d->rows-1+(d->showInsertRow?1:0); - TQColorGroup selectedColorGroup(tqcolorGroup()); + TQColorGroup selectedColorGroup(colorGroup()); selectedColorGroup.setColor( TQColorGroup::Button, KexiUtils::blendedColors( selectedColorGroup.color(TQColorGroup::Background), d->selectionBackgroundColor, 2, 1) ); selectedColorGroup.setColor( TQColorGroup::Background, selectedColorGroup.color(TQColorGroup::Button) ); //set background color as well (e.g. for thinkeramik) - TQColorGroup highlightedColorGroup(tqcolorGroup()); + TQColorGroup highlightedColorGroup(colorGroup()); highlightedColorGroup.setColor( TQColorGroup::Button, KexiUtils::blendedColors( highlightedColorGroup.color(TQColorGroup::Background), d->selectionBackgroundColor, 4, 1) ); @@ -206,7 +206,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e) TQRect r(0, y, width(), d->rowHeight); p.drawRect(r); tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r, - (d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : tqcolorGroup()), + (d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0)); } if (d->editRow!=-1 && d->editRow >= first && d->editRow <= (last/*+1 for insert row*/)) { @@ -220,7 +220,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e) && (!d->showInsertRow || (d->showInsertRow && d->currentRow < last)))/*don't display marker for 'insert' row*/ { //show marker - p.setBrush(tqcolorGroup().foreground()); + p.setBrush(colorGroup().foreground()); p.setPen(TQPen(TQt::NoPen)); TQPointArray points(3); int ofs = d->rowHeight / 4; diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 4c1dd02b0..9dd8cccce 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -102,7 +102,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const d->lyr->addSpacing( 6 ); d->lyr->addWidget( m_navRecordNumber = new KLineEdit(this) ); - m_navRecordNumber->tqsetAlignment(AlignRight | AlignVCenter); + m_navRecordNumber->setAlignment(AlignRight | AlignVCenter); m_navRecordNumber->setFocusPolicy(TQ_ClickFocus); m_navRecordNumber->installEventFilter(this); // m_navRowNumber->setFixedWidth(fw); @@ -112,20 +112,20 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const TQToolTip::add(m_navRecordNumber, i18n("Current row number")); KLineEdit *lbl_of = new KLineEdit(i18n("of"), this); - lbl_of->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); + lbl_of->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); lbl_of->setMaximumWidth(fm.width(lbl_of->text())+8); lbl_of->setReadOnly(true); lbl_of->setLineWidth(0); lbl_of->setFocusPolicy(TQ_NoFocus); - lbl_of->tqsetAlignment(AlignCenter); + lbl_of->setAlignment(AlignCenter); d->lyr->addWidget( lbl_of ); d->lyr->addWidget( m_navRecordCount = new KLineEdit(this) ); - m_navRecordCount->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); + m_navRecordCount->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); m_navRecordCount->setReadOnly(true); m_navRecordCount->setLineWidth(0); m_navRecordCount->setFocusPolicy(TQ_NoFocus); - m_navRecordCount->tqsetAlignment(AlignLeft | AlignVCenter); + m_navRecordCount->setAlignment(AlignLeft | AlignVCenter); TQToolTip::add(m_navRecordCount, i18n("Number of rows")); lbl_of->setFont(f); @@ -337,7 +337,7 @@ void KexiRecordNavigator::updateGeometry(int leftMargin) if (m_view) { int navWidth; if (m_view->horizontalScrollBar()->isVisible()) { - navWidth = tqsizeHint().width(); + navWidth = sizeHint().width(); } else { navWidth = leftMargin + m_view->clipper()->width(); @@ -345,9 +345,9 @@ void KexiRecordNavigator::updateGeometry(int leftMargin) setGeometry( m_view->frameWidth(), - m_view->height() - m_view->horizontalScrollBar()->tqsizeHint().height()-m_view->frameWidth(), + m_view->height() - m_view->horizontalScrollBar()->sizeHint().height()-m_view->frameWidth(), navWidth, - m_view->horizontalScrollBar()->tqsizeHint().height() + m_view->horizontalScrollBar()->sizeHint().height() ); m_view->updateScrollBars(); @@ -361,7 +361,7 @@ void KexiRecordNavigator::setHBarGeometry( TQScrollBar & hbar, int x, int y, int void KexiRecordNavigator::setLabelText(const TQString& text) { - m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::tqfromLatin1(" ")+text+" ")); + m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::fromLatin1(" ")+text+" ")); } void KexiRecordNavigator::setInsertingButtonVisible(bool set) @@ -429,7 +429,7 @@ void KexiRecordNavigator::setEditingIndicatorEnabled(bool set) if (d->editingIndicatorEnabled) { if (!d->editingIndicatorLabel) { d->editingIndicatorLabel = new TQLabel(this); - d->editingIndicatorLabel->tqsetAlignment(TQt::AlignCenter); + d->editingIndicatorLabel->setAlignment(TQt::AlignCenter); TQPixmap pix; pix.convertFromImage( *KexiRecordMarker::penImage() ); d->editingIndicatorLabel->setFixedWidth( pix.width() + 2*2 ); diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp index 7d71752c1..ad55774e2 100644 --- a/kexi/widget/utils/kexitooltip.cpp +++ b/kexi/widget/utils/kexitooltip.cpp @@ -42,7 +42,7 @@ KexiToolTip::~KexiToolTip() { } -TQSize KexiToolTip::tqsizeHint() const +TQSize KexiToolTip::sizeHint() const { TQSize sz(fontMetrics().boundingRect(m_value.toString()).size()); return sz; diff --git a/kexi/widget/utils/kexitooltip.h b/kexi/widget/utils/kexitooltip.h index cfa1b4838..83d0d7e01 100644 --- a/kexi/widget/utils/kexitooltip.h +++ b/kexi/widget/utils/kexitooltip.h @@ -32,7 +32,7 @@ class KEXIGUIUTILS_EXPORT KexiToolTip : public TQWidget KexiToolTip(const TQVariant& value, TQWidget* parent); virtual ~KexiToolTip(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: virtual void show(); diff --git a/kformula/kformulawidget.cc b/kformula/kformulawidget.cc index dc2593202..e48e026d2 100644 --- a/kformula/kformulawidget.cc +++ b/kformula/kformulawidget.cc @@ -72,7 +72,7 @@ void KFormulaWidget::paintEvent(TQPaintEvent* event) // than it seems to be as each cursor movement requires a tqrepaint. TQPainter p( &buffer ); //p.translate( -fr.x(), -fr.y() ); - formulaView.draw( p, event->rect(), tqcolorGroup() ); + formulaView.draw( p, event->rect(), colorGroup() ); TQPainter painter; painter.begin(this); diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp index 96fee8cbf..3bbc05a5a 100644 --- a/kivio/kiviopart/kivio_canvas.cpp +++ b/kivio/kiviopart/kivio_canvas.cpp @@ -1006,7 +1006,7 @@ KoPoint KivioCanvas::snapToGuides(const KoPoint& point, bool &snappedX, bool &sn if (m_pView->isSnapGuides()) { - KoGuides::SnaptqStatus status = KoGuides::SNAP_NONE; + KoGuides::SnapStatus status = KoGuides::SNAP_NONE; KoPoint diff; m_guides.snapToGuideLines(p, 4, status, diff); p += diff; diff --git a/kivio/kiviopart/kivio_spawner_drag.cpp b/kivio/kiviopart/kivio_spawner_drag.cpp index 7f1ba9850..249138b06 100644 --- a/kivio/kiviopart/kivio_spawner_drag.cpp +++ b/kivio/kiviopart/kivio_spawner_drag.cpp @@ -47,13 +47,13 @@ const char *KivioSpawnerDrag::format( int i ) const return 0L; } -TQByteArray KivioSpawnerDrag::tqencodedData( const char *mime ) const +TQByteArray KivioSpawnerDrag::encodedData( const char *mime ) const { TQByteArray a; if( TQString(mime) == "application/x-qiconlist" ) { - a = TQIconDrag::tqencodedData(mime); + a = TQIconDrag::encodedData(mime); } else if( TQString(mime) == "kivio/stencilSpawner" ) { diff --git a/kivio/kiviopart/kivio_spawner_drag.h b/kivio/kiviopart/kivio_spawner_drag.h index 9bd68dfea..cb4942211 100644 --- a/kivio/kiviopart/kivio_spawner_drag.h +++ b/kivio/kiviopart/kivio_spawner_drag.h @@ -33,7 +33,7 @@ public: virtual ~KivioSpawnerDrag(); const char *format(int i) const; - TQByteArray tqencodedData( const char *mime ) const; + TQByteArray encodedData( const char *mime ) const; static bool canDecode( TQMimeSource* e ); void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, KivioStencilSpawner &spawner ); diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp index 4b42fa09b..64fa96bfa 100644 --- a/kivio/kiviopart/kivio_stackbar.cpp +++ b/kivio/kiviopart/kivio_stackbar.cpp @@ -52,8 +52,8 @@ void KivioStackBar::insertPage( TQWidget* w, const TQString& title ) w->hide(); w->setFocusPolicy(TQ_NoFocus); - setMinimumWidth( TQMAX(tqminimumSize().width(),w->tqminimumSize().width() ) ); - setMaximumWidth( TQMAX(tqmaximumSize().width(),w->tqmaximumSize().width() ) ); + setMinimumWidth( TQMAX(minimumSize().width(),w->minimumSize().width() ) ); + setMaximumWidth( TQMAX(maximumSize().width(),w->maximumSize().width() ) ); DragBarButton* b = new DragBarButton( title, this ); b->setOrientation(orientation()); diff --git a/kivio/kiviopart/kiviodragobject.cpp b/kivio/kiviopart/kiviodragobject.cpp index 35a6d7fff..9b6b9a46a 100644 --- a/kivio/kiviopart/kiviodragobject.cpp +++ b/kivio/kiviopart/kiviodragobject.cpp @@ -56,7 +56,7 @@ const char* KivioDragObject::format(int i) const return id.format(i - NumEncodeFormats); } -TQByteArray KivioDragObject::tqencodedData(const char* mimetype) const +TQByteArray KivioDragObject::encodedData(const char* mimetype) const { if((m_encodeMimeList[0] == mimetype) || (m_encodeMimeList[1] == mimetype)) @@ -90,7 +90,7 @@ bool KivioDragObject::decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, Kivio if(e->provides("application/vnd.kde.kivio")) { TQDomDocument doc("KivioSelection"); - TQByteArray data = e->tqencodedData("application/vnd.kde.kivio"); + TQByteArray data = e->encodedData("application/vnd.kde.kivio"); doc.setContent( TQCString( data, data.size()+1 ) ); KivioLayer l(page); ok = l.loadXML(doc.documentElement()); @@ -178,7 +178,7 @@ TQByteArray KivioDragObject::imageEncoded(const char* mimetype) const TQImageDrag id; id.setImage(buffer.convertToImage()); - return id.tqencodedData(mimetype); + return id.encodedData(mimetype); } #include "kiviodragobject.moc" diff --git a/kivio/kiviopart/kiviodragobject.h b/kivio/kiviopart/kiviodragobject.h index 99d632f76..d441af197 100644 --- a/kivio/kiviopart/kiviodragobject.h +++ b/kivio/kiviopart/kiviodragobject.h @@ -36,7 +36,7 @@ class KivioDragObject : public TQDragObject KivioDragObject(TQWidget* dragSource = 0, const char* name = 0); const char* format(int i) const; - TQByteArray tqencodedData(const char* mimetype) const; + TQByteArray encodedData(const char* mimetype) const; bool canDecode(TQMimeSource*); bool decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, KivioPage* page); void setStencilList(TQPtrList<KivioStencil> l); diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp index 4407d2d09..7dac3244f 100644 --- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp @@ -294,7 +294,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Rectangle"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); kivioShape.setAttribute("x", TQString::number(diaPointToKivio(svgChild.attribute("x").toFloat(),true) * m_xscale)); kivioShape.setAttribute("y", TQString::number(diaPointToKivio(svgChild.attribute("y").toFloat(), false) * m_yscale)); kivioShape.setAttribute("w", TQString::number(svgChild.attribute("width").toFloat() * m_xscale)); @@ -309,7 +309,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Ellipse"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("r").toFloat(),true) * m_xscale))); kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("r").toFloat(), false) * m_yscale))); kivioShape.setAttribute("w", TQString::number(svgChild.attribute("r").toFloat() * m_xscale * 2)); @@ -324,7 +324,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Ellipse"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("rx").toFloat(),true) * m_xscale))); kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("ry").toFloat(), false) * m_yscale))); kivioShape.setAttribute("w", TQString::number(svgChild.attribute("rx").toFloat() * m_xscale * 2)); @@ -339,7 +339,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "LineArray"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); TQDomElement lineArrayElement = kivio.createElement("Line"); lineArrayElement.setAttribute("x1", TQString::number(diaPointToKivio(svgChild.attribute("x1").toFloat(),true) * m_xscale)); @@ -358,7 +358,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Polyline"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); TQStringList points = TQStringList::split(" ", svgChild.attribute("points")); for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it) @@ -387,7 +387,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Polygon"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); TQStringList points = TQStringList::split(" ", svgChild.attribute("points")); for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it) @@ -428,7 +428,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) kivioShape.setAttribute("type", "OpenPath"); } - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); DiaPathParser *dpp = new DiaPathParser(&kivio, &kivioShape, m_xscale, m_yscale, diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp index 07f005fa1..02c850e40 100644 --- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp @@ -549,7 +549,7 @@ void KivioScreenPainter::drawPolyline( TQPointArray &pArray ) m_pPainter->setPen(m_pLineStyle->pen(1.0f)); m_pPainter->setBrush( TQBrush::NoBrush ); - m_pPainter->tqdrawPolyline( pArray, 0, pArray.size() ); + m_pPainter->drawPolyline( pArray, 0, pArray.size() ); } void KivioScreenPainter::drawPolygon( TQPointArray &pArray ) @@ -586,7 +586,7 @@ void KivioScreenPainter::drawPolygon( TQPointArray &pArray ) m_pPainter->setPen(m_pLineStyle->pen(1.0f)); m_pPainter->setBrush(b); - m_pPainter->tqdrawPolygon( pArray, true ); + m_pPainter->drawPolygon( pArray, true ); m_pPainter->setBrushOrigin(0, 0); } diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp index d3d30dae9..4b5b42159 100644 --- a/kivio/kiviopart/stencilbarbutton.cpp +++ b/kivio/kiviopart/stencilbarbutton.cpp @@ -74,7 +74,7 @@ DragBarButton::DragBarButton( const TQString& text, TQWidget* parent, const char setPixmap(stencil_xpm); - const TQColorGroup& g = tqcolorGroup(); + const TQColorGroup& g = colorGroup(); TQColor c = g.buttonText(); int cr, cg, cb; @@ -121,8 +121,8 @@ void DragBarButton::drawButton( TQPainter* paint ) pix.fill(eraseColor()); TQPainter pixPainter(&pix); - const TQColorGroup& g = tqcolorGroup(); - tqstyle().tqdrawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), tqcolorGroup() ); + const TQColorGroup& g = colorGroup(); + tqstyle().drawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), colorGroup() ); int m = 3; int tw = 0; @@ -132,7 +132,7 @@ void DragBarButton::drawButton( TQPainter* paint ) pw = m_pIcon->width(); tqstyle().drawItem( &pixPainter, TQRect( m, 0, pw, pixSize.height() ), AlignLeft | AlignVCenter, - tqcolorGroup(), isEnabled(), + colorGroup(), isEnabled(), m_pIcon, TQString(), -1, &g.buttonText()); } @@ -146,7 +146,7 @@ void DragBarButton::drawButton( TQPainter* paint ) tqstyle().drawItem( &pixPainter, TQRect( x, 0, tw, pixSize.height() ), AlignLeft | AlignVCenter|ShowPrefix, - tqcolorGroup(), isEnabled(), + colorGroup(), isEnabled(), 0L, t, -1, &g.buttonText()); } @@ -183,7 +183,7 @@ void DragBarButton::setPixmap( const TQPixmap& pixmap ) m_pIcon = new TQPixmap(pixmap); } -TQSize DragBarButton::tqsizeHint() const +TQSize DragBarButton::sizeHint() const { constPolish(); int m = 3; @@ -300,9 +300,9 @@ void DragBarButton::setOrientation(Qt::Orientation orientation) m_orientation = orientation; if(m_orientation == Qt::Vertical) { - tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); } else { - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); } } diff --git a/kivio/kiviopart/stencilbarbutton.h b/kivio/kiviopart/stencilbarbutton.h index 6f207a7fa..67595db90 100644 --- a/kivio/kiviopart/stencilbarbutton.h +++ b/kivio/kiviopart/stencilbarbutton.h @@ -35,7 +35,7 @@ class DragBarButton : public TQPushButton void setIcon( const TQString& ); void setPixmap( const TQPixmap& ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; Qt::Orientation orientation() const { return m_orientation; } diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp index ecf923f93..74ae5d2a9 100644 --- a/kivio/kiviopart/stencilbardockmanager.cpp +++ b/kivio/kiviopart/stencilbardockmanager.cpp @@ -219,7 +219,7 @@ void StencilBarDockManager::slotMoving() moveManager->setGeometry(globalPos.x(), moveManager->y(), bar->width(), - moveManager->getWidget()->tqsizeHint().height()); + moveManager->getWidget()->sizeHint().height()); return; } } @@ -556,8 +556,8 @@ void KoToolDockMoveManager::doResizeInternal() void KoToolDockMoveManager::setWidget( TQWidget* _w ) { widget = _w; - minSize = widget->tqminimumSize(); - maxSize = widget->tqmaximumSize(); + minSize = widget->minimumSize(); + maxSize = widget->maximumSize(); rr = TQRect(widget->mapToGlobal(TQPoint(0,0)),widget->size()); p = rr.topLeft(); diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui index 27f8c3b37..1ed0c1972 100644 --- a/kivio/kiviopart/ui/aligndialog.ui +++ b/kivio/kiviopart/ui/aligndialog.ui @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -317,7 +317,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kivio/kiviopart/ui/kivio_protection_panel_base.ui b/kivio/kiviopart/ui/kivio_protection_panel_base.ui index 55fe9888c..e17749005 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_protection_panel_base.ui @@ -12,13 +12,13 @@ <height>147</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -107,7 +107,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>281</height> diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index 239008944..393b771de 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -114,20 +114,20 @@ void KivioOptionsDialog::initPage() TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page); m_layoutTxtLbl = new TQLabel(page); m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken); - m_layoutTxtLbl->tqsetSizePolicy(TQSizePolicy( + m_layoutTxtLbl->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setLayoutText(m_layout); KPushButton* layoutBtn = new KPushButton(i18n("Change..."), page); - layoutBtn->tqsetSizePolicy(TQSizePolicy( + layoutBtn->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed)); TQLabel* fontLbl = new TQLabel(i18n("Default font:"), page); m_fontTxtLbl = new TQLabel(page); m_fontTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken); - m_fontTxtLbl->tqsetSizePolicy(TQSizePolicy( + m_fontTxtLbl->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setFontText(m_font); KPushButton* fontBtn = new KPushButton(i18n("Change..."), page); - layoutBtn->tqsetSizePolicy(TQSizePolicy( + layoutBtn->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_marginsChBox = new TQCheckBox(i18n("Show page &margins"), page); m_marginsChBox->setChecked(view->isShowPageMargins()); diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 94dd995d0..14c390fa8 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -68,7 +68,7 @@ void KivioTextFormatDlg::initPositionTab() m_halignBGrp->setButton(1); m_preview = new TQLabel(i18n("Preview"), tab); m_preview->setFrameStyle(TQFrame::Box | TQFrame::Sunken); - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); TQGridLayout* gl = new TQGridLayout(tab); gl->setSpacing(KDialog::spacingHint()); gl->setRowStretch(0, 10); @@ -95,7 +95,7 @@ void KivioTextFormatDlg::updateVAlign(int i) break; } - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } void KivioTextFormatDlg::updateHAlign(int i) @@ -112,7 +112,7 @@ void KivioTextFormatDlg::updateHAlign(int i) break; } - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } int KivioTextFormatDlg::valign() @@ -150,7 +150,7 @@ void KivioTextFormatDlg::setVAlign(int i) } m_valign = static_cast<TQt::AlignmentFlags>(i); - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } void KivioTextFormatDlg::setHAlign(int i) @@ -168,7 +168,7 @@ void KivioTextFormatDlg::setHAlign(int i) } m_halign = static_cast<TQt::AlignmentFlags>(i); - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } void KivioTextFormatDlg::setFont(TQFont f) diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp index ed32c284d..4a2d1fb5c 100644 --- a/kivio/kiviopart/ui/layerlisttooltip.cpp +++ b/kivio/kiviopart/ui/layerlisttooltip.cpp @@ -49,13 +49,13 @@ void LayerListToolTip::maybeTip(const TQPoint& pos) return; } - TQRect tqitemRect = m_listView->tqitemRect(item); + TQRect itemRect = m_listView->itemRect(item); TQString toolTip = "<b>" + item->layer()->name() + "</b><br>"; toolTip += i18n("Visible: ") + (item->layer()->visible() ? i18n("Yes") : i18n("No")) + "<br>"; toolTip += i18n("Printable: ") + (item->layer()->printable() ? i18n("Yes") : i18n("No")) + "<br>"; toolTip += i18n("Editable: ") + (item->layer()->editable() ? i18n("Yes") : i18n("No")) + "<br>"; toolTip += i18n("Connectable: ") + (item->layer()->connectable() ? i18n("Yes") : i18n("No")); - tip(tqitemRect, toolTip); + tip(itemRect, toolTip); } } diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui index cfa2f3173..0e8aac771 100644 --- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui +++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui @@ -185,7 +185,7 @@ You should have received a copy of the GNU General Public License along with thi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp index 49a42589b..062e329e8 100644 --- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp +++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp @@ -108,7 +108,7 @@ void StencilTextEditor::setHorizontalAlign(int flag) m_mainWidget->m_hAlignButton->popup()->setItemChecked(flag, true); m_mainWidget->m_hAlignButton->setIconSet(*(m_mainWidget->m_hAlignButton->popup()->iconSet(flag))); - m_mainWidget->m_textArea->tqsetAlignment(flag|verticalAlignment()); + m_mainWidget->m_textArea->setAlignment(flag|verticalAlignment()); m_hAlign = flag; } @@ -120,7 +120,7 @@ void StencilTextEditor::setVerticalAlign(int flag) m_mainWidget->m_vAlignButton->popup()->setItemChecked(flag, true); m_mainWidget->m_vAlignButton->setIconSet(*(m_mainWidget->m_vAlignButton->popup()->iconSet(flag))); - m_mainWidget->m_textArea->tqsetAlignment(flag|horizontalAlignment()); + m_mainWidget->m_textArea->setAlignment(flag|horizontalAlignment()); m_vAlign = flag; } @@ -169,7 +169,7 @@ void StencilTextEditor::updateFormating() m_mainWidget->m_textArea->selectAll(true); - m_mainWidget->m_textArea->tqsetAlignment(horizontalAlignment()|verticalAlignment()); + m_mainWidget->m_textArea->setAlignment(horizontalAlignment()|verticalAlignment()); m_mainWidget->m_textArea->selectAll(false); m_mainWidget->m_textArea->setFocus(); diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 93bbb6c42..7f3371e48 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -126,13 +126,13 @@ void EntryItem::paint( TQPainter *p ) TQBrush brush; if ( isCurrent() || isSelected() || mPaintActive ) - brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); + brush = box->colorGroup().brush( TQColorGroup::Highlight ); else - brush = TQBrush(box->tqcolorGroup().highlight().light( 115 )); + brush = TQBrush(box->colorGroup().highlight().light( 115 )); p->fillRect( 1, 0, w - 2, h - 1, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; - pen.setColor( box->tqcolorGroup().mid() ); + pen.setColor( box->colorGroup().mid() ); p->setPen( pen ); p->drawPoint( 1, 0 ); @@ -149,9 +149,9 @@ void EntryItem::paint( TQPainter *p ) p->drawPixmap( x, y, mPixmap ); } - TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115); + TQColor shadowColor = listBox()->colorGroup().background().dark(115); if ( isCurrent() || isSelected() ) { - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().highlightedText() ); } if ( !text().isEmpty() && navigator()->showText() ) { @@ -176,13 +176,13 @@ void EntryItem::paint( TQPainter *p ) } if ( isCurrent() || isSelected() || mHasHover ) { - p->setPen( box->tqcolorGroup().highlight().dark(115) ); + p->setPen( box->colorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, text() ); - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().highlightedText() ); } else - p->setPen( box->tqcolorGroup().text() ); + p->setPen( box->colorGroup().text() ); p->drawText( x, y, text() ); } @@ -283,7 +283,7 @@ void Navigator::slotExecuted( TQListBoxItem *item ) executedItem = item; } -TQSize Navigator::tqsizeHint() const +TQSize Navigator::sizeHint() const { return TQSize( mMinWidth, 100 ); } @@ -409,7 +409,7 @@ IconSidePane::IconSidePane(TQWidget *parent, const char *name ) m_buttongroup->setExclusive(true); m_buttongroup->hide(); mWidgetstack = new TQWidgetStack(this); - mWidgetstack->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + mWidgetstack->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); // setup the popup menu mShowIcons = KoShellSettings::sidePaneShowIcons(); diff --git a/koshell/iconsidepane.h b/koshell/iconsidepane.h index e0c4f7f03..7f550fbad 100644 --- a/koshell/iconsidepane.h +++ b/koshell/iconsidepane.h @@ -100,12 +100,12 @@ class EntryItemToolTip : public TQToolTip if ( !mListBox ) return; TQListBoxItem* item = mListBox->itemAt( p ); if ( !item ) return; - const TQRect tqitemRect = mListBox->tqitemRect( item ); - if ( !tqitemRect.isValid() ) return; + const TQRect itemRect = mListBox->itemRect( item ); + if ( !itemRect.isValid() ) return; const EntryItem *entryItem = static_cast<EntryItem*>( item ); TQString tipStr = entryItem->text(); - tip( tqitemRect, tipStr ); + tip( itemRect, tipStr ); } private: TQListBox* mListBox; @@ -123,7 +123,7 @@ class Navigator : public KListBox int insertItem(const TQString &_text, const TQString &_pix); - TQSize tqsizeHint() const; + TQSize sizeHint() const; IconViewMode viewMode(); bool showText(); bool showIcons(); diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 9639ae716..cbc314ab0 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -66,7 +66,7 @@ KoShellWindow::KoShellWindow() // Setup the sidebar m_pSidebar = new IconSidePane( m_pLayout ); - m_pSidebar->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, + m_pSidebar->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); m_pSidebar->setActionCollection( actionCollection() ); m_grpFile = m_pSidebar->insertGroup(i18n("Components"), false, TQT_TQOBJECT(this), TQT_SLOT( slotSidebar_Part(int ))); @@ -75,7 +75,7 @@ KoShellWindow::KoShellWindow() // Setup the tabbar m_pFrame = new KTabWidget( m_pLayout ); - m_pFrame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_pFrame->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); m_pFrame->setTabPosition( KTabWidget::Bottom ); @@ -175,7 +175,7 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* ) KoFilterManager *manager = new KoFilterManager( url.path() ); TQCString mimetype; // an empty mimetype means, that the "nearest" - KoFilter::ConversiontqStatus status = manager->exp0rt( tmpFile->name(), mimetype ); // KOffice part will be chosen + KoFilter::ConversionStatus status = manager->exp0rt( tmpFile->name(), mimetype ); // KOffice part will be chosen delete manager; if ( status != KoFilter::OK || mimetype.isEmpty() ) { diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui index e76a6129c..c10917453 100644 --- a/kplato/kptaccountspanelbase.ui +++ b/kplato/kptaccountspanelbase.ui @@ -13,7 +13,7 @@ <height>234</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>220</height> diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc index 9825d9c23..5fd3c7cd8 100644 --- a/kplato/kptaccountsview.cc +++ b/kplato/kptaccountsview.cc @@ -99,7 +99,7 @@ AccountsView::AccountsView(Project &project, View *view, TQWidget *parent) m_project(project), m_accounts(project.accounts()) { - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); m_period = 0; m_periodTexts<<i18n("Day")<<i18n("Week")<<i18n("Month"); m_cumulative = false; @@ -110,10 +110,10 @@ AccountsView::AccountsView(Project &project, View *view, TQWidget *parent) m_label = new Label(this); m_label->setFrameShape(TQLabel::StyledPanel); m_label->setFrameShadow(TQLabel::Sunken); - m_label->tqsetAlignment(int(TQLabel::WordBreak | TQLabel::AlignVCenter)); + m_label->setAlignment(int(TQLabel::WordBreak | TQLabel::AlignVCenter)); lay2->addWidget(m_label); m_changeBtn = new TQPushButton(i18n("Configure..."), this); - m_changeBtn->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_changeBtn->sizePolicy().hasHeightForWidth())); + m_changeBtn->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_changeBtn->sizePolicy().hasHeightForWidth())); lay2->addWidget(m_changeBtn); lay1->addLayout(lay2); @@ -139,7 +139,7 @@ void AccountsView::zoom(double zoom) { } void AccountsView::init() { - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); m_period = 0; initAccList(m_accounts.accountList()); } @@ -378,7 +378,7 @@ bool AccountsView::setContext(Context::Accountsview &context) { //m_dlv->setSizes(list); //NOTE: This doesn't always work! m_date = context.date; if (!m_date.isValid()) - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); m_period = context.period; m_cumulative = context.cumulative; setContextClosedItems(context); diff --git a/kplato/kptcalendar.cc b/kplato/kptcalendar.cc index 486c3dacd..56ba7380f 100644 --- a/kplato/kptcalendar.cc +++ b/kplato/kptcalendar.cc @@ -225,11 +225,11 @@ Duration CalendarDay::effort(const TQTime &start, const TQTime &end) { for (; it.current(); ++it) { //kdDebug()<<k_funcinfo<<"Interval: "<<it.current()->first.toString()<<" - "<<it.current()->second.toString()<<endl; if (end > it.current()->first && start < it.current()->second) { - DateTime dtStart(TQDate::tqcurrentDate(), start); + DateTime dtStart(TQDate::currentDate(), start); if (start < it.current()->first) { dtStart.setTime(it.current()->first); } - DateTime dtEnd(TQDate::tqcurrentDate(), end); + DateTime dtEnd(TQDate::currentDate(), end); if (end > it.current()->second) { dtEnd.setTime(it.current()->second); } @@ -282,8 +282,8 @@ Duration CalendarDay::duration() const { Duration dur; TQPtrListIterator<TQPair<TQTime, TQTime> > it = m_workingIntervals; for (; it.current(); ++it) { - DateTime start(TQDate::tqcurrentDate(), it.current()->first); - DateTime end(TQDate::tqcurrentDate(), it.current()->second); + DateTime start(TQDate::currentDate(), it.current()->first); + DateTime end(TQDate::currentDate(), it.current()->second); dur += end - start; } return dur; diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cc index aaa6fab06..a7b36ef1f 100644 --- a/kplato/kptcalendareditbase.cc +++ b/kplato/kptcalendareditbase.cc @@ -54,7 +54,7 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f groupBox2->tqlayout()->setSpacing( 6 ); groupBox2->tqlayout()->setMargin( 6 ); groupBox2Layout = new TQGridLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2Layout->setAlignment( TQt::AlignTop ); calendarPanel = new CalendarPanel( groupBox2, "calendarPanel" ); @@ -65,7 +65,7 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f day->tqlayout()->setSpacing( 6 ); day->tqlayout()->setMargin( 6 ); dayLayout = new TQVBoxLayout( day->tqlayout() ); - dayLayout->tqsetAlignment( TQt::AlignTop ); + dayLayout->setAlignment( TQt::AlignTop ); tqlayout8 = new TQHBoxLayout( 0, 0, 6, "tqlayout8"); @@ -81,7 +81,7 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f groupBox4->tqlayout()->setSpacing( 6 ); groupBox4->tqlayout()->setMargin( 6 ); groupBox4Layout = new TQVBoxLayout( groupBox4->tqlayout() ); - groupBox4Layout->tqsetAlignment( TQt::AlignTop ); + groupBox4Layout->setAlignment( TQt::AlignTop ); intervalList = new TQListView( groupBox4, "intervalList" ); intervalList->addColumn( tr2i18n( "Work Interval" ) ); @@ -109,7 +109,7 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f groupBox2Layout->addWidget( day, 1, 1 ); CalendarEditBaseLayout->addWidget( groupBox2 ); languageChange(); - resize( TQSize(540, 340).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(540, 340).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc index b5a2d59cb..c10a34b58 100644 --- a/kplato/kptcalendarlistdialog.cc +++ b/kplato/kptcalendarlistdialog.cc @@ -182,8 +182,8 @@ CalendarListDialog::CalendarListDialog(Project &p, TQWidget *parent, const char if (f) { dia->calendarList->setSelected(f, true); } - //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<tqsizeHint().width()<<"x"<<tqsizeHint().height()<<endl; - resize(TQSize(725, 388).expandedTo(tqminimumSizeHint())); + //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<sizeHint().width()<<"x"<<sizeHint().height()<<endl; + resize(TQSize(725, 388).expandedTo(minimumSizeHint())); setMainWidget(dia); enableButtonOK(false); diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc index e63229448..48b4f9ca6 100644 --- a/kplato/kptcalendarpanel.cc +++ b/kplato/kptcalendarpanel.cc @@ -65,7 +65,7 @@ CalendarPanel::CalendarPanel(TQWidget *parent, TQDate dt, const char *name, WFla CalendarPanel::CalendarPanel( TQWidget *parent, const char *name ) : TQFrame(parent,name) { - init( TQDate::tqcurrentDate() ); + init( TQDate::currentDate() ); } void CalendarPanel::init( const TQDate &dt ) @@ -96,10 +96,10 @@ void CalendarPanel::init( const TQDate &dt ) setFontSize(10); line->setValidator(val); line->installEventFilter( this ); - yearForward->setPixmap(BarIcon(TQString::tqfromLatin1("2rightarrow"))); - yearBackward->setPixmap(BarIcon(TQString::tqfromLatin1("2leftarrow"))); - monthForward->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); - monthBackward->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow"))); + yearForward->setPixmap(BarIcon(TQString::fromLatin1("2rightarrow"))); + yearBackward->setPixmap(BarIcon(TQString::fromLatin1("2leftarrow"))); + monthForward->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); + monthBackward->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); setDate(dt); // set button texts connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -164,7 +164,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) // ----- calculate button row height: for(count=0; count<NoOfButtons; ++count) { if ( buttons[count] ) { // closeButton may be 0L - sizes[count]=buttons[count]->tqsizeHint(); + sizes[count]=buttons[count]->sizeHint(); buttonHeight=TQMAX(buttonHeight, sizes[count].height()); } else @@ -175,7 +175,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) for(count=0; count<NoOfButtons; ++count) { if(buttons[count]==selectMonth) { TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin))); + sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin))); } } // ----- center buttons @@ -195,7 +195,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) x+=w; } // ----- place the line edit for direct input: - sizes[0]=line->tqsizeHint(); + sizes[0]=line->sizeHint(); int week_width=d->selectWeek->fontMetrics().width(i18n("Week XX"))+((d->closeButton != 0L) ? 50 : 20); line->setGeometry(0, height()-sizes[0].height(), width()-week_width, sizes[0].height()); d->selectWeek->setGeometry(width()-week_width, height()-sizes[0].height(), week_width, sizes[0].height()); @@ -285,7 +285,7 @@ CalendarPanel::selectWeekClicked() PopupFrame* popup = new PopupFrame(this); DateInternalWeekSelector* picker = new DateInternalWeekSelector(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -322,7 +322,7 @@ CalendarPanel::selectMonthClicked() PopupFrame* popup = new PopupFrame(this); DateInternalMonthPicker* picker = new DateInternalMonthPicker(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); picker->setFocus(); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); @@ -352,7 +352,7 @@ CalendarPanel::selectYearClicked() PopupFrame* popup = new PopupFrame(this); DateInternalYearSelector* picker = new DateInternalYearSelector(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -409,9 +409,9 @@ CalendarPanel::lineEnterPressed() } TQSize -CalendarPanel::tqsizeHint() const +CalendarPanel::sizeHint() const { - TQSize tableSize=table->tqsizeHint(); + TQSize tableSize=table->sizeHint(); TQWidget *buttons[]={ yearBackward, monthBackward, @@ -427,13 +427,13 @@ CalendarPanel::tqsizeHint() const // ----- store the size hints: for(count=0; count<NoOfButtons; ++count) { if ( buttons[count] ) - sizes[count]=buttons[count]->tqsizeHint(); + sizes[count]=buttons[count]->sizeHint(); else sizes[count] = TQSize(0,0); if(buttons[count]==selectMonth) { TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin)); + cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin)); } else { cx+=sizes[count].width(); } @@ -442,7 +442,7 @@ CalendarPanel::tqsizeHint() const // ----- calculate width hint: cx=TQMAX(cx, tableSize.width()); // line edit ignored // ----- calculate height hint: - cy+=tableSize.height()+line->tqsizeHint().height(); + cy+=tableSize.height()+line->sizeHint().height(); return TQSize(cx, cy); } @@ -471,7 +471,7 @@ CalendarPanel::setFontSize(int s) } TQFontMetrics metrics(selectMonth->fontMetrics()); for(int i=1; i <= 12; ++i) - { // maxMonthRect is used by tqsizeHint() + { // maxMonthRect is used by sizeHint() r=metrics.boundingRect(KGlobal::locale()->calendar()->monthName(i, false)); maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width())); maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); @@ -490,7 +490,7 @@ CalendarPanel::setCloseButton( bool enable ) TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); connect( d->closeButton, TQT_SIGNAL( clicked() ), - tqtopLevelWidget(), TQT_SLOT( close() ) ); + topLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/kplato/kptcalendarpanel.h b/kplato/kptcalendarpanel.h index 9cf6c4f8f..0c72d763f 100644 --- a/kplato/kptcalendarpanel.h +++ b/kplato/kptcalendarpanel.h @@ -54,7 +54,7 @@ public: /** The usual constructor. The given date will be displayed * initially. **/ - CalendarPanel(TQWidget *parent=0, TQDate=TQDate::tqcurrentDate(), const char *name=0, WFlags f=0); + CalendarPanel(TQWidget *parent=0, TQDate=TQDate::currentDate(), const char *name=0, WFlags f=0); /** * Standard qt widget constructor. The initial date will be the @@ -73,9 +73,9 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize tqsizeHint() const; + TQSize sizeHint() const; - TQSize tqminimumSizeHint() const { return tqsizeHint(); } + TQSize minimumSizeHint() const { return sizeHint(); } /** * Sets the date. * @@ -113,7 +113,7 @@ public: /** * By calling this method with @p enable = true, CalendarPanel will show * a little close-button in the upper button-row. Clicking the - * close-button will cause the CalendarPanel's tqtopLevelWidget()'s close() + * close-button will cause the CalendarPanel's topLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see #hasCloseButton diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc index 59690e3a8..9cd6654e8 100644 --- a/kplato/kptcanvasitem.cc +++ b/kplato/kptcanvasitem.cc @@ -70,15 +70,15 @@ int PertNodeItem::RTTI = 2000; void PertNodeItem::setVisible(bool yes) { //kdDebug()<<k_funcinfo<<m_node.name()<<endl; - TQCanvasPolygon::tqsetVisible(yes); + TQCanvasPolygon::setVisible(yes); TQCanvasItemList list = canvas()->allItems(); TQCanvasItemList::Iterator it = list.begin(); for (; it != list.end(); ++it) { if ( *it == m_name ) - m_name->tqsetVisible(yes); + m_name->setVisible(yes); if ( *it == m_leader ) - m_leader->tqsetVisible(yes); + m_leader->setVisible(yes); } } @@ -274,7 +274,7 @@ PertRelationItem::PertRelationItem( PertCanvas *view, PertNodeItem *parent, Pert { //kdDebug()<<k_funcinfo<<"Parent="<<parent->node().name()<<" Child="<<child->node().name()<<endl; draw(); - tqsetVisible(true); + setVisible(true); } PertRelationItem::~PertRelationItem() diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc index 729d64438..2186d4006 100644 --- a/kplato/kptconfigdialog.cc +++ b/kplato/kptconfigdialog.cc @@ -41,7 +41,7 @@ namespace KPlato // little helper stolen from kmail/kword static inline TQPixmap loadIcon( const char * name ) { return KGlobal::instance()->iconLoader() - ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc index afa065912..44f91500e 100644 --- a/kplato/kptdatetable.cc +++ b/kplato/kptdatetable.cc @@ -88,7 +88,7 @@ DateTable::DateTable(TQWidget *parent, TQDate date_, const char* name, WFlags f) setFontSize(10); if(!date_.isValid()) { kdError() <<k_funcinfo<<"Given date is invalid, using current date." << endl; - date_=TQDate::tqcurrentDate(); + date_=TQDate::currentDate(); } setFocusPolicy( TQ_StrongFocus ); setNumCols(7+m_dateStartCol); // 7 days a week + maybe 1 for weeknumbers @@ -232,7 +232,7 @@ void DateTable::paintDay(TQPainter *painter, int row, int col) { painter->lineTo(w-1, h-1); } // then paint square if current date - if (d == TQDate::tqcurrentDate()) { + if (d == TQDate::currentDate()) { painter->setPen(colorLine); painter->drawRect(1, 1, w-2, h-2); } @@ -317,7 +317,7 @@ void DateTable::keyPressEvent( TQKeyEvent *e ) { return; } if ( e->key() == TQt::Key_N ) { - setDate(TQDate::tqcurrentDate()); + setDate(TQDate::currentDate()); return; } if ( e->key() == TQt::Key_Control ) { @@ -353,7 +353,7 @@ void DateTable::setFontSize(int size) { maxCell.setHeight(TQMAX(maxCell.height(), rect.height())); } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::tqfromLatin1("88")); + rect=metrics.boundingRect(TQString::fromLatin1("88")); maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height())); } @@ -582,12 +582,12 @@ void DateTable::focusOutEvent( TQFocusEvent *e ) { TQGridView::focusOutEvent( e ); } -TQSize DateTable::tqsizeHint() const { +TQSize DateTable::sizeHint() const { if(maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - //kdDebug() << "DateTable::tqsizeHint: obscure failure - " << endl; + //kdDebug() << "DateTable::sizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } @@ -794,7 +794,7 @@ DateInternalMonthPicker::DateInternalMonthPicker } TQSize -DateInternalMonthPicker::tqsizeHint() const +DateInternalMonthPicker::sizeHint() const { return TQSize((max.width()+6)*numCols()+2*frameWidth(), (max.height()+6)*numRows()+2*frameWidth()); diff --git a/kplato/kptdatetable.h b/kplato/kptdatetable.h index 815a86e9c..9cd992e3b 100644 --- a/kplato/kptdatetable.h +++ b/kplato/kptdatetable.h @@ -104,11 +104,11 @@ public: /** * The size hint. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * The minimum size hint. */ - TQSize tqminimumSizeHint() const { return tqsizeHint(); } + TQSize minimumSizeHint() const { return sizeHint(); } /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -260,7 +260,7 @@ public: /** * The constructor. */ - DateTable(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(), + DateTable(TQWidget *parent=0, TQDate date=TQDate::currentDate(), const char* name="DateTable", WFlags f=0); /** @@ -268,9 +268,9 @@ public: * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * tqsizeHint() simply returns a multiple of maxCell. + * sizeHint() simply returns a multiple of maxCell. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Set the font size of the date table. */ diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc index 2780d166e..23c0c80b0 100644 --- a/kplato/kptdoublelistviewbase.cc +++ b/kplato/kptdoublelistviewbase.cc @@ -388,9 +388,9 @@ DoubleListViewBase::DoubleListViewBase(TQWidget *parent, bool description) } -TQSize DoubleListViewBase::tqsizeHint() const { - //kdDebug()<<k_funcinfo<<tqminimumSizeHint()<<endl; - return tqminimumSizeHint(); //HACK: koshell splitter problem +TQSize DoubleListViewBase::sizeHint() const { + //kdDebug()<<k_funcinfo<<minimumSizeHint()<<endl; + return minimumSizeHint(); //HACK: koshell splitter problem } void DoubleListViewBase::clearSlaveList() { diff --git a/kplato/kptdoublelistviewbase.h b/kplato/kptdoublelistviewbase.h index aaaaf3059..e56b21b93 100644 --- a/kplato/kptdoublelistviewbase.h +++ b/kplato/kptdoublelistviewbase.h @@ -83,7 +83,7 @@ public: void setFormat(int fieldwidth=0, char fmt='f', int prec=0); void setMasterFormat(int fieldwidth=0, char fmt='f', int prec=0); void setSlaveFormat(int fieldwidth=0, char fmt='f', int prec=0); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; class MasterListItem; class SlaveListItem : public KListViewItem { diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui index a923dab49..e437fa58c 100644 --- a/kplato/kptdurationwidget.ui +++ b/kplato/kptdurationwidget.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -48,13 +48,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32676</width> <height>20</height> @@ -106,13 +106,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>70</width> <height>32767</height> @@ -163,7 +163,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -202,7 +202,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -252,7 +252,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -302,13 +302,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc index 925598f9a..e37ab194e 100644 --- a/kplato/kptganttview.cc +++ b/kplato/kptganttview.cc @@ -73,8 +73,8 @@ public: MyKDGanttView(TQWidget *parent, const char *name) : KDGanttView(parent, name) { } - virtual TQSize tqsizeHint() const { - return tqminimumSizeHint(); //HACK: koshell splitter tqminimumSize problem + virtual TQSize sizeHint() const { + return minimumSizeHint(); //HACK: koshell splitter minimumSize problem } }; @@ -1048,7 +1048,7 @@ void GanttView::print(KPrinter &prt) { p.drawRect(0,0,metrics.width(),metrics.height()); TQString text; int hei = 0; - text = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); + text = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); TQRect r = p.boundingRect(metrics.width()-1,0,0,0, TQt::AlignRight, text ); p.drawText( r, TQt::AlignRight, text ); hei = r.height(); diff --git a/kplato/kptintervaleditbase.ui b/kplato/kptintervaleditbase.ui index 76b00dc42..4e847442a 100644 --- a/kplato/kptintervaleditbase.ui +++ b/kplato/kptintervaleditbase.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> diff --git a/kplato/kptmainprojectdialog.cc b/kplato/kptmainprojectdialog.cc index a9f40ae0c..ee8ed8fc4 100644 --- a/kplato/kptmainprojectdialog.cc +++ b/kplato/kptmainprojectdialog.cc @@ -39,7 +39,7 @@ MainProjectDialog::MainProjectDialog(Project &p, TQWidget *parent, const char *n setMainWidget(panel); enableButtonOK(false); - resize( TQSize(500, 410).expandedTo(tqminimumSizeHint())); + resize( TQSize(500, 410).expandedTo(minimumSizeHint())); connect(panel, TQT_SIGNAL(obligatedFieldsFilled(bool)), TQT_SLOT(enableButtonOK(bool))); } diff --git a/kplato/kptmainprojectpanelbase.ui b/kplato/kptmainprojectpanelbase.ui index f6622781e..108c6f141 100644 --- a/kplato/kptmainprojectpanelbase.ui +++ b/kplato/kptmainprojectpanelbase.ui @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> @@ -99,7 +99,7 @@ <property name="name"> <cstring>wbs</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> diff --git a/kplato/kptmilestoneprogresspanel.cc b/kplato/kptmilestoneprogresspanel.cc index b5c1af0a6..67b884437 100644 --- a/kplato/kptmilestoneprogresspanel.cc +++ b/kplato/kptmilestoneprogresspanel.cc @@ -85,7 +85,7 @@ void MilestoneProgressPanelImpl::slotChanged() { void MilestoneProgressPanelImpl::slotFinishedChanged(bool state) { if (state) { if (!finishTime->dateTime().isValid()) { - finishTime->setDateTime(TQDateTime::tqcurrentDateTime()); + finishTime->setDateTime(TQDateTime::currentDateTime()); } } enableWidgets(); diff --git a/kplato/kptmilestoneprogresspanelbase.ui b/kplato/kptmilestoneprogresspanelbase.ui index 97a06f4d9..9856eca5a 100644 --- a/kplato/kptmilestoneprogresspanelbase.ui +++ b/kplato/kptmilestoneprogresspanelbase.ui @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc index 1da218e68..9f8d5a0df 100644 --- a/kplato/kptnode.cc +++ b/kplato/kptnode.cc @@ -96,7 +96,7 @@ void Node::init() { m_visitedForward = false; m_visitedBackward = false; - m_dateOnlyStartDate = m_dateOnlyEndDate = TQDate::tqcurrentDate(); + m_dateOnlyStartDate = m_dateOnlyEndDate = TQDate::currentDate(); m_dateOnlyDuration.addDays(1); m_runningAccount = 0; diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc index 9379de4ab..13c44cb39 100644 --- a/kplato/kptproject.cc +++ b/kplato/kptproject.cc @@ -56,7 +56,7 @@ Project::Project(Node *parent) void Project::init() { if (m_parent == 0) { // set sensible defaults for a project wo parent - m_constraintStartTime = TQDateTime(TQDate::tqcurrentDate(), TQTime()); + m_constraintStartTime = TQDateTime(TQDate::currentDate(), TQTime()); m_constraintEndTime = TQDateTime(m_constraintStartTime.addDays(1)); } m_calendars.setAutoDelete(true); diff --git a/kplato/kptprojectdialogbase.ui b/kplato/kptprojectdialogbase.ui index 2dab71fe9..6ff94658e 100644 --- a/kplato/kptprojectdialogbase.ui +++ b/kplato/kptprojectdialogbase.ui @@ -153,7 +153,7 @@ <property name="name"> <cstring>schedulerDate</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index 655d19071..3bdab2b2c 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -83,7 +83,7 @@ public: if (!tag.contains('.')) { // global tags if (tag == "currentdate") { - return l->formatDate(TQDate::tqcurrentDate(), true); + return l->formatDate(TQDate::currentDate(), true); } return TQString(); } diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc index 448074aed..2c218fe9a 100644 --- a/kplato/kptresource.cc +++ b/kplato/kptresource.cc @@ -203,7 +203,7 @@ Resource::Resource(Project *project) : m_project(project), m_schedules(), m_work m_type = Type_Work; m_units = 100; // % - m_availableFrom = DateTime(TQDate::tqcurrentDate()); + m_availableFrom = DateTime(TQDate::currentDate()); m_availableUntil = TQDateTime(m_availableFrom.addYears(2)); cost.normalRate = 100; diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cc index 4b6d7a446..5531156f0 100644 --- a/kplato/kptresourceappointmentsview.cc +++ b/kplato/kptresourceappointmentsview.cc @@ -200,7 +200,7 @@ void ResourceAppointmentsView::print(KPrinter &/*printer*/) { // m_dlv->setSizes(list); // m_date = context.date; // if (!m_date.isValid()) -// m_date = TQDate::tqcurrentDate(); +// m_date = TQDate::currentDate(); // m_period = context.period; // m_cumulative = context.cumulative; // diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc index d596ff444..40d4b7c93 100644 --- a/kplato/kptresourceview.cc +++ b/kplato/kptresourceview.cc @@ -268,7 +268,7 @@ protected: p->translate( rleft, crtop ); //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl; - current->i->paintBranches( p, tqcolorGroup(), treeStepSize(), + current->i->paintBranches( p, colorGroup(), treeStepSize(), rtop - crtop, r.height() ); p->restore(); } @@ -362,8 +362,8 @@ public: TQDate date; }; -TQSize ResourceView::tqsizeHint() const { - return tqminimumSizeHint(); // HACK: koshell splitter tqminimumSize problem +TQSize ResourceView::sizeHint() const { + return minimumSizeHint(); // HACK: koshell splitter minimumSize problem } ResourceView::ResourceView(View *view, TQWidget *parent) diff --git a/kplato/kptresourceview.h b/kplato/kptresourceview.h index b3049ed37..7154af8f5 100644 --- a/kplato/kptresourceview.h +++ b/kplato/kptresourceview.h @@ -71,7 +71,7 @@ class ResourceItemPrivate; virtual bool setContext(Context::Resourceview &context); virtual void getContext(Context::Resourceview &context) const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void setShowAppointments(bool on) { m_showAppointments = on; } diff --git a/kplato/kptsummarytaskgeneralpanelbase.ui b/kplato/kptsummarytaskgeneralpanelbase.ui index 57dd2654e..57e25e510 100644 --- a/kplato/kptsummarytaskgeneralpanelbase.ui +++ b/kplato/kptsummarytaskgeneralpanelbase.ui @@ -13,7 +13,7 @@ <height>250</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>0</height> @@ -127,7 +127,7 @@ This is not limited to persons available in a resource group but can be anyone. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cc index 5e96030e4..387e75e52 100644 --- a/kplato/kpttaskappointmentsview.cc +++ b/kplato/kpttaskappointmentsview.cc @@ -151,7 +151,7 @@ void TaskAppointmentsView::print(KPrinter &/*printer*/) { // m_dlv->setSizes(list); // m_date = context.date; // if (!m_date.isValid()) -// m_date = TQDate::tqcurrentDate(); +// m_date = TQDate::currentDate(); // m_period = context.period; // m_cumulative = context.cumulative; // diff --git a/kplato/kpttaskappointmentsview.ui.h b/kplato/kpttaskappointmentsview.ui.h index 7e090fb7a..fe0cc9c99 100644 --- a/kplato/kpttaskappointmentsview.ui.h +++ b/kplato/kpttaskappointmentsview.ui.h @@ -90,7 +90,7 @@ void TaskAppointmentsView::init() m_appList->setColumnAlignment(6, AlignRight); m_task = 0; - m_date->setDate(TQDate::tqcurrentDate()); + m_date->setDate(TQDate::currentDate()); } diff --git a/kplato/kpttaskcostpanelbase.ui b/kplato/kpttaskcostpanelbase.ui index 38250f2bc..9907a26ac 100644 --- a/kplato/kpttaskcostpanelbase.ui +++ b/kplato/kpttaskcostpanelbase.ui @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kplato/kpttaskdefaultpanel.cc b/kplato/kpttaskdefaultpanel.cc index 3fd5472b1..bcaac757b 100644 --- a/kplato/kpttaskdefaultpanel.cc +++ b/kplato/kpttaskdefaultpanel.cc @@ -81,7 +81,7 @@ void TaskDefaultPanel::setStartValues(Task &task, StandardWorktime *workTime) { if (task.constraintStartTime().isValid()) { setStartDateTime(task.constraintStartTime()); } else { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setStartDateTime(TQDateTime(date, TQTime())); } if (task.constraintEndTime().isValid()) { diff --git a/kplato/kpttaskgeneralpanel.cc b/kplato/kpttaskgeneralpanel.cc index 6dd1dad2d..f89706756 100644 --- a/kplato/kpttaskgeneralpanel.cc +++ b/kplato/kpttaskgeneralpanel.cc @@ -93,7 +93,7 @@ void TaskGeneralPanel::setStartValues(Task &task, StandardWorktime *workTime) { if (task.constraintStartTime().isValid()) { setStartDateTime(task.constraintStartTime()); } else { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setStartDateTime(TQDateTime(date, TQTime())); } if (task.constraintEndTime().isValid()) { diff --git a/kplato/kpttaskgeneralpanelbase.ui b/kplato/kpttaskgeneralpanelbase.ui index 1d153a02b..e61f316e4 100644 --- a/kplato/kpttaskgeneralpanelbase.ui +++ b/kplato/kpttaskgeneralpanelbase.ui @@ -121,7 +121,7 @@ This is not limited to persons available in a resource group but can be anyone. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kplato/kpttaskprogresspanel.cc b/kplato/kpttaskprogresspanel.cc index e8cfb570f..bed7a3c21 100644 --- a/kplato/kpttaskprogresspanel.cc +++ b/kplato/kpttaskprogresspanel.cc @@ -147,7 +147,7 @@ void TaskProgressPanelImpl::slotChanged() { void TaskProgressPanelImpl::slotStartedChanged(bool state) { if (state) { - startTime->setDateTime(TQDateTime::tqcurrentDateTime()); + startTime->setDateTime(TQDateTime::currentDateTime()); percentFinished->setValue(0); } enableWidgets(); @@ -158,7 +158,7 @@ void TaskProgressPanelImpl::slotFinishedChanged(bool state) { if (state) { percentFinished->setValue(100); if (!finishTime->dateTime().isValid()) { - finishTime->setDateTime(TQDateTime::tqcurrentDateTime()); + finishTime->setDateTime(TQDateTime::currentDateTime()); } } enableWidgets(); diff --git a/kplato/kpttaskprogresspanelbase.ui b/kplato/kpttaskprogresspanelbase.ui index 00d23ddac..2bcb2eac0 100644 --- a/kplato/kpttaskprogresspanelbase.ui +++ b/kplato/kpttaskprogresspanelbase.ui @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>41</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>70</height> @@ -247,7 +247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -303,7 +303,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>320</width> <height>0</height> @@ -320,7 +320,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>59</width> <height>20</height> @@ -365,7 +365,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kplato/kpttaskresourcespanelbase.ui b/kplato/kpttaskresourcespanelbase.ui index dfa3b818b..52fa42d05 100644 --- a/kplato/kpttaskresourcespanelbase.ui +++ b/kplato/kpttaskresourcespanelbase.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>groupList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> diff --git a/kplato/kptwbsdefinition.cc b/kplato/kptwbsdefinition.cc index fd6b48aab..f33d355c0 100644 --- a/kplato/kptwbsdefinition.cc +++ b/kplato/kptwbsdefinition.cc @@ -140,7 +140,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"}; TQString WBSDefinition::toRoman( int n, bool upper ) { if ( n >= 0 ) { - TQString s = TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] + + TQString s = TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] + RNHundreds[ ( n / 100 ) % 10 ] + RNTens[ ( n / 10 ) % 10 ] + RNUnits[ ( n ) % 10 ] ); diff --git a/kplato/kptwbsdefinitionpanelbase.ui b/kplato/kptwbsdefinitionpanelbase.ui index 4656ce4eb..afe672f80 100644 --- a/kplato/kptwbsdefinitionpanelbase.ui +++ b/kplato/kptwbsdefinitionpanelbase.ui @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> diff --git a/kplato/kptxmlloaderobject.h b/kplato/kptxmlloaderobject.h index 814af40b2..c8ddc7a5d 100644 --- a/kplato/kptxmlloaderobject.h +++ b/kplato/kptxmlloaderobject.h @@ -46,14 +46,14 @@ public: void startLoad() { m_timer.start(); - m_starttime = TQDateTime::tqcurrentDateTime(); + m_starttime = TQDateTime::currentDateTime(); m_errors = m_warnings = 0; m_log.clear(); addMsg(TQString("Loading started at %1").tqarg(m_starttime.toString())); } void stopLoad() { m_elapsed = m_timer.elapsed(); - addMsg(TQString("Loading finished at %1, took %2").tqarg(TQDateTime::tqcurrentDateTime().toString()).tqarg(formatElapsed())); + addMsg(TQString("Loading finished at %1, took %2").tqarg(TQDateTime::currentDateTime().toString()).tqarg(formatElapsed())); } TQDateTime lastLoaded() const { return m_starttime; } int elapsed() const { return m_elapsed; } diff --git a/kplato/relationpanel.ui b/kplato/relationpanel.ui index 409a52f97..bfa7fbdca 100644 --- a/kplato/relationpanel.ui +++ b/kplato/relationpanel.ui @@ -24,7 +24,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -47,7 +47,7 @@ <property name="name"> <cstring>groupBox1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -236,7 +236,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/kplato/resourcedialogbase.ui b/kplato/resourcedialogbase.ui index 8107e9ac4..3fb04b756 100644 --- a/kplato/resourcedialogbase.ui +++ b/kplato/resourcedialogbase.ui @@ -79,7 +79,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>32767</height> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui index 8428e29ca..5af1ac5dc 100644 --- a/kplato/resourcespanelbase.ui +++ b/kplato/resourcespanelbase.ui @@ -13,7 +13,7 @@ <height>227</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>200</height> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>220</height> diff --git a/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui index 61f4fddb7..7d33ffb35 100644 --- a/kplato/standardworktimedialogbase.ui +++ b/kplato/standardworktimedialogbase.ui @@ -200,7 +200,7 @@ when there is no calendar defined for a resource.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>210</height> diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp index 88245f6db..60c5cdcb8 100644 --- a/kpresenter/KPrAutoformObject.cpp +++ b/kpresenter/KPrAutoformObject.cpp @@ -237,8 +237,8 @@ void KPrAutoformObject::paint( TQPainter* _painter, KoTextZoomHandler *_zoomHand { if ( angle == 0 || angle==360 ) { - //int ox = _painter->viewport().x() + static_cast<int>( _painter->tqworldMatrix().dx() ); - //int oy = _painter->viewport().y() + static_cast<int>( _painter->tqworldMatrix().dy() ); + //int ox = _painter->viewport().x() + static_cast<int>( _painter->worldMatrix().dx() ); + //int oy = _painter->viewport().y() + static_cast<int>( _painter->worldMatrix().dy() ); TQPointArray pntArray3 = pntArray2.copy(); _painter->save(); diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index b616f802d..b404231d3 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -175,7 +175,7 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, picTab->setMargin( 5 ); TQLabel *l = new TQLabel( i18n( "View mode:" ), picTab ); - l->setFixedHeight( l->tqsizeHint().height() ); + l->setFixedHeight( l->sizeHint().height() ); picView = new TQComboBox( false, picTab ); picView->insertItem( i18n( "Scaled" ) ); @@ -186,10 +186,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, this, TQT_SLOT( updateConfiguration() ) ); picChooseLabel = new TQLabel( i18n("&Location:"), picTab ); - picChooseLabel->setFixedHeight( picChooseLabel->tqsizeHint().height() ); + picChooseLabel->setFixedHeight( picChooseLabel->sizeHint().height() ); picChoose = new KURLRequester( picTab, "picChoose" ); - picChoose->setFixedHeight( picChoose->tqsizeHint().height() ); + picChoose->setFixedHeight( picChoose->sizeHint().height() ); picChoose->setMode( KFile::ExistingOnly ); connect( picChoose, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), TQT_SLOT( aboutToSelectPic() ) ); diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index 661020459..484a5eab8 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -282,7 +282,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context ) strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href); - const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); backPicture.setKey(key); KoStore* store = context.store(); diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index c43faed36..e5e977852 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -4602,8 +4602,8 @@ void KPrCanvas::moveObjectsByKey( int x, int y ) m_moveSnapDiff = KoPoint( 0, 0 ); - KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; - m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff ); + KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; + m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snapStatus, m_moveSnapDiff ); move += m_moveSnapDiff; } @@ -4672,7 +4672,7 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged ) move -= m_moveSnapDiff; m_moveSnapDiff = KoPoint( 0, 0 ); // needed if all snapping is off - KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; + KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; if ( snapToGrid ) { @@ -4680,12 +4680,12 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged ) - movedRect.topLeft().x() ); m_moveSnapDiff.setY( tqRound( movedRect.topLeft().y() / doc->getGridY()) * doc->getGridY() - movedRect.topLeft().y() ); - snaptqStatus = KoGuides::SNAP_BOTH; + snapStatus = KoGuides::SNAP_BOTH; } if ( snapToGuideLines ) { - m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff ); + m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snapStatus, m_moveSnapDiff ); } move += m_moveSnapDiff; @@ -4745,7 +4745,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k TQRect oldBoundingRect( m_view->zoomHandler()->zoomRect( kpobject->getRepaintRect() ) ); KoRect objRect = kpobject->getRealRect(); - KoGuides::SnaptqStatus snaptqStatus( KoGuides::SNAP_NONE ); + KoGuides::SnapStatus snapStatus( KoGuides::SNAP_NONE ); bool left = false; bool right = false; @@ -4754,22 +4754,22 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU ) { top = true; - snaptqStatus |= KoGuides::SNAP_HORIZ; + snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD ) { bottom = true; - snaptqStatus |= KoGuides::SNAP_HORIZ; + snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD ) { left = true; - snaptqStatus |= KoGuides::SNAP_VERT; + snapStatus |= KoGuides::SNAP_VERT; } if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD ) { right = true; - snaptqStatus |= KoGuides::SNAP_VERT; + snapStatus |= KoGuides::SNAP_VERT; } double newLeft = objRect.left(); @@ -4931,7 +4931,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k { sp.setY( rect.bottom() ); } - m_gl.repaintSnapping( sp, snaptqStatus ); + m_gl.repaintSnapping( sp, snapStatus ); } _tqrepaint( oldBoundingRect ); @@ -5553,18 +5553,18 @@ KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping ) bool snapToGuideLines = doc->showGuideLines() && !m_disableSnapping; KoPoint snapDiff = KoPoint( 0, 0 ); // needed if all snapping is off - KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; + KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; if ( snapToGrid ) { snapDiff.setX( tqRound( sp.x() / doc->getGridX()) * doc->getGridX() - sp.x() ); snapDiff.setY( tqRound( sp.y() / doc->getGridY()) * doc->getGridY() - sp.y() ); - snaptqStatus = KoGuides::SNAP_BOTH; + snapStatus = KoGuides::SNAP_BOTH; } if ( snapToGuideLines ) { - m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snaptqStatus, snapDiff ); + m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snapStatus, snapDiff ); } sp += snapDiff; diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index 7a880406b..d7cb13cf6 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -490,7 +490,7 @@ TQDomDocument KPrDocument::saveXML() emit sigProgress( 0 ); } - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); recalcVariables( VT_STATISTIC ); @@ -1006,7 +1006,7 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) KoXmlWriter* contentWriter = createOasisXmlWriter( &contentDev, "office:document-content" ); - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); recalcVariables( VT_STATISTIC ); @@ -3386,7 +3386,7 @@ void KPrDocument::setEmpty() { KoDocument::setEmpty(); // Whether loaded from template or from empty doc: this is a new one -> set creation date - m_varColl->variableSetting()->setCreationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setCreationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); // , VST_CREATION_DATE ... // If we then load a document, it will override that date. } diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index a394e0a81..abddeb680 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -68,7 +68,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< TQGridLayout *upperRow = new TQGridLayout(grp1->tqlayout(), 6, 4); lAppear = new TQLabel( i18n( "Order of appearance:" ), grp1 ); - lAppear->tqsetAlignment( AlignVCenter ); + lAppear->setAlignment( AlignVCenter ); upperRow->addWidget(lAppear, 0, 0); eAppearStep = new TQSpinBox( 0, 100, 1, grp1 ); @@ -79,7 +79,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< //( void )new TQWidget( grp1 ); lEffect = new TQLabel( i18n( "Effect (appearing):" ), grp1 ); - lEffect->tqsetAlignment( AlignVCenter ); + lEffect->setAlignment( AlignVCenter ); upperRow->addWidget(lEffect, 1, 0); cEffect = new TQComboBox( false, grp1, "cEffect" ); @@ -102,7 +102,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< connect( cEffect, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( appearEffectChanged( int ) ) ); lAppearSpeed = new TQLabel( i18n( "Speed:" ), grp1 ); - lAppearSpeed->tqsetAlignment( AlignVCenter ); + lAppearSpeed->setAlignment( AlignVCenter ); upperRow->addWidget(lAppearSpeed, 2, 0); cAppearSpeed = new TQComboBox( false, grp1, "cEffect" ); @@ -114,7 +114,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< appearEffectChanged( cEffect->currentItem() ); lEffect2 = new TQLabel( i18n( "Effect (object specific):" ), grp1 ); - lEffect2->tqsetAlignment( AlignVCenter ); + lEffect2->setAlignment( AlignVCenter ); upperRow->addWidget(lEffect2, 3, 0); cEffect2 = new TQComboBox( false, grp1, "cEffect2" ); @@ -144,7 +144,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< } TQLabel *lTimerOfAppear = new TQLabel( i18n( "Timer of the object:" ), grp1 ); - lTimerOfAppear->tqsetAlignment( AlignVCenter ); + lTimerOfAppear->setAlignment( AlignVCenter ); upperRow->addWidget( lTimerOfAppear, 4, 0 ); timerOfAppear = new KIntNumInput( obj->getAppearTimer(), grp1 ); @@ -164,7 +164,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< connect( appearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( appearSoundEffectChanged() ) ); lSoundEffect1 = new TQLabel( i18n( "File name:" ), grp1 ); - lSoundEffect1->tqsetAlignment( AlignVCenter ); + lSoundEffect1->setAlignment( AlignVCenter ); upperRow->addWidget( lSoundEffect1, 6, 0 ); requester1 = new KURLRequester( grp1 ); @@ -203,7 +203,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< TQGridLayout *lowerRow = new TQGridLayout(grp2->tqlayout(), 5, 4); lDisappear = new TQLabel( i18n( "Order of disappearance:" ), grp2 ); - lDisappear->tqsetAlignment( AlignVCenter ); + lDisappear->setAlignment( AlignVCenter ); lowerRow->addWidget(lDisappear, 0, 0); eDisappearStep = new TQSpinBox( 0, 100, 1, grp2 ); @@ -211,7 +211,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< lowerRow->addWidget(eDisappearStep, 0, 1); lDEffect = new TQLabel( i18n( "Effect (disappearing):" ), grp2 ); - lDEffect->tqsetAlignment( AlignVCenter ); + lDEffect->setAlignment( AlignVCenter ); lowerRow->addWidget(lDEffect, 1, 0); cDisappear = new TQComboBox( false, grp2, "cDisappear" ); @@ -234,7 +234,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< connect( cDisappear, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( disappearEffectChanged( int ) ) ); lDisappearSpeed = new TQLabel( i18n( "Speed:" ), grp2 ); - lDisappearSpeed->tqsetAlignment( AlignVCenter ); + lDisappearSpeed->setAlignment( AlignVCenter ); lowerRow->addWidget(lDisappearSpeed, 2, 0); cDisappearSpeed = new TQComboBox( false, grp2, "cEffect" ); @@ -247,7 +247,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< //appearEffectChanged( cEffect->currentItem() ); TQLabel *lTimerOfDisappear = new TQLabel( i18n( "Timer of the object:" ), grp2 ); - lTimerOfDisappear->tqsetAlignment( AlignVCenter ); + lTimerOfDisappear->setAlignment( AlignVCenter ); lowerRow->addWidget( lTimerOfDisappear, 3, 0 ); timerOfDisappear = new KIntNumInput( obj->getDisappearTimer(), grp2 ); @@ -268,7 +268,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< connect( disappearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearSoundEffectChanged() ) ); lSoundEffect2 = new TQLabel( i18n( "File name:" ), grp2 ); - lSoundEffect2->tqsetAlignment( AlignVCenter ); + lSoundEffect2->setAlignment( AlignVCenter ); lowerRow->addWidget( lSoundEffect2, 5, 0 ); requester2 = new KURLRequester( grp2 ); diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index f9a87fd58..298e86453 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -298,13 +298,13 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie TQLabel *helptext = new TQLabel( this ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); helptext->setText( i18n( "Please enter the directory where the memory stick " "presentation should be saved. Please also enter a " "title for the slideshow presentation. " ) ); TQLabel *lable2 = new TQLabel( i18n("Path:"), this ); - lable2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lable2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); path=new KURLRequester( this ); path->setMode( KFile::Directory); path->lineEdit()->setText(msPres.getPath()); @@ -320,7 +320,7 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie TQLabel *lable1 = new TQLabel( i18n("Title:"), this, "lable1" ); - lable1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lable1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); // TODO - check if there is already a presentation with this title, and // add a number after it until there isn't. title = new KLineEdit( msPres.getTitle(), this ); @@ -351,13 +351,13 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie "leave these set to the default.") ); TQHBox *textColourLayout = new TQHBox( colourGroup ); TQLabel *lable3 = new TQLabel( i18n("Text color:"), textColourLayout ); - lable3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lable3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); textColour = new KColorButton( msPres.getTextColour(), textColourLayout ); lable3->setBuddy( textColour ); TQHBox *backgroundColourLayout = new TQHBox( colourGroup ); TQLabel *lable4 = new TQLabel( i18n("Background color:"), backgroundColourLayout ); - lable4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lable4->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); backColour = new KColorButton( msPres.getBackColour(), backgroundColourLayout ); lable4->setBuddy( backColour ); colourGroup->setHidden( true ); diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp index 10048537f..576b11ccd 100644 --- a/kpresenter/KPrNoteBar.cpp +++ b/kpresenter/KPrNoteBar.cpp @@ -145,7 +145,7 @@ void KPrNoteBar::printNotes( TQPainter *_painter, KPrinter *_printer, TQValueLis TQRect viewRect( body ); do { - richText.draw( _painter, body.left(), body.top(), viewRect, tqcolorGroup() ); + richText.draw( _painter, body.left(), body.top(), viewRect, colorGroup() ); viewRect.moveBy( 0, body.height() ); _painter->translate( 0, -body.height() ); _painter->setFont( font ); diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp index 1afef9776..d1afdd8b8 100644 --- a/kpresenter/KPrPBPreview.cpp +++ b/kpresenter/KPrPBPreview.cpp @@ -67,7 +67,7 @@ void KPrPBPreview::drawContents( TQPainter *painter ) if ( paintType == Pen ) { painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), - tqcolorGroup().base() ); + colorGroup().base() ); KoSize diff1( 0, 0 ), diff2( 0, 0 ); int _w = int( pen.pointWidth() ); @@ -94,7 +94,7 @@ void KPrPBPreview::drawContents( TQPainter *painter ) } else if ( paintType == Brush ) { painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), - tqcolorGroup().base() ); + colorGroup().base() ); painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), brush ); } else if ( paintType == Gradient ) painter->drawPixmap( 0, 0, gradient->pixmap()); diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index a7df156f3..0b1aab1fd 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -209,7 +209,7 @@ void KPrPgConfDia::setupPageSlides() TQWidget* spacer = new TQWidget( buttonGroup ); - spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); slidesLayout->addMultiCellWidget( buttonGroup, 4, 4, 0, 1 ); if ( !m_doc->presentationName().isEmpty() ) diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp index 0a4c89210..9e4320e38 100644 --- a/kpresenter/KPrPixmapObject.cpp +++ b/kpresenter/KPrPixmapObject.cpp @@ -365,7 +365,7 @@ void KPrPixmapObject::loadOasis(const TQDomElement &element, KoOasisContext & co strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); image.setKey(key); KoStore* store = context.store(); diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index 88163c62d..34f578f68 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -48,7 +48,7 @@ KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name, slides->setSelected( slides->firstChild(), true ); label = new TQLabel( i18n( "Presentation duration: " ) + _durationString, page ); - label->tqsetAlignment( AlignVCenter ); + label->setAlignment( AlignVCenter ); topLayout->addWidget( label ); setMinimumSize( 600, 400 ); diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index b39ab5b06..4988a5bbe 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -762,7 +762,7 @@ KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ) setSorting( -1 ); header()->hide(); addColumn( i18n( "Slide" ) ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h index b6450f110..8f23225f3 100644 --- a/kpresenter/KPrSideBar.h +++ b/kpresenter/KPrSideBar.h @@ -109,7 +109,7 @@ public: KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ); ~KPrOutline(); void setCurrentPage( int pg ); - TQSize tqsizeHint() const { return TQSize( 145, KListView::tqsizeHint().height() ); } + TQSize sizeHint() const { return TQSize( 145, KListView::sizeHint().height() ); } void updateItem( int pagenr, bool sticky = false); void addItem( int pos ); void moveItem( int oldPos, int newPos ); @@ -154,7 +154,7 @@ public: m_thb->setCurrentPage(pg); }; void setOn( int , bool ) { }; - //TQSize tqsizeHint() const { return TQSize( 120, TQTabWidget::tqsizeHint().height() ); }; + //TQSize sizeHint() const { return TQSize( 120, TQTabWidget::sizeHint().height() ); }; void updateItem( KPrPage *page ); void addItem( int pos ); void moveItem( int oldPos, int newPos ); diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 6cec5fc22..54934755f 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -1834,7 +1834,7 @@ void KPrTextView::paste() TQCString returnedMimeType = KoTextObject::providesOasis( data ); if ( !returnedMimeType.isEmpty() ) { - TQByteArray arr = data->tqencodedData( returnedMimeType ); + TQByteArray arr = data->encodedData( returnedMimeType ); if ( arr.size() ) { #if 0 @@ -1850,7 +1850,7 @@ void KPrTextView::paste() } else { - // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" ) + // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). TQString text = TQApplication::tqclipboard()->text(); if ( !text.isEmpty() ) @@ -2379,7 +2379,7 @@ TQDragObject * KPrTextView::newDrag( TQWidget * parent ) KPrDocument * doc = kpTextObject()->kPresenterDocument(); - doc->getVariableCollection()->variableSetting()->setModificationDate( TQDateTime::tqcurrentDateTime() ); + doc->getVariableCollection()->variableSetting()->setModificationDate( TQDateTime::currentDateTime() ); doc->recalcVariables( VT_DATE ); doc->recalcVariables( VT_TIME ); doc->recalcVariables( VT_STATISTIC ); @@ -2490,7 +2490,7 @@ void KPrTextView::dropEvent( TQDropEvent * e ) TQCString returnedTypeMime = KoTextObject::providesOasis( e ); if ( !returnedTypeMime.isEmpty() ) { - TQByteArray arr = e->tqencodedData( returnedTypeMime ); + TQByteArray arr = e->encodedData( returnedTypeMime ); if ( arr.size() ) { KCommand *cmd = kpTextObject()->pasteOasis( cursor(), arr, false ); diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp index 6708065b7..891ff5b4e 100644 --- a/kpresenter/KPrTextProperty.cpp +++ b/kpresenter/KPrTextProperty.cpp @@ -45,7 +45,7 @@ KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const Marg connect( m_protectContentCheck, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotProtectContentChanged( bool ) ) ); - resize( TQSize( 301, 217 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 301, 217 ).expandedTo( minimumSizeHint() ) ); m_margins->setValues( marginsStruct.leftMargin, marginsStruct.rightMargin, marginsStruct.topMargin, marginsStruct.bottomMargin ); diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index a7fc0899e..3fad79a22 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -260,7 +260,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, automaticPreview->setChecked( true ); TQWidget* previewspacer = new TQWidget( previewgrp ); - previewspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + previewspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); previewButton = new TQPushButton( previewgrp ); @@ -314,7 +314,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, connect( timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(timeChanged(int)) ); TQWidget* rspacer = new TQWidget( rightpart ); - rspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + rspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); TQWidget* lspacer = new TQWidget( leftpart ); lspacer->setMinimumSize( 10, spacingHint() ); diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index a86caa802..13e912f11 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -410,23 +410,23 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) if ( sb ) // No statusbar in e.g. konqueror { m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbPageLabel, 0 ); m_sbModifiedLabel = new KStatusBarLabel( " ", 0, sb ); - m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbModifiedLabel, 0 ); m_sbObjectLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbObjectLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbObjectLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbObjectLabel, 1 ); m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_pKPresenterDoc->zoomHandler()->zoom() ) + "% ", 0, sb ); - m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbZoomLabel, 0 ); m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_pKPresenterDoc->unit() ) + ' ', 0, sb ); - m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbUnitLabel, 0 ); } @@ -581,7 +581,7 @@ void KPrView::print( KPrinter &prt ) m_canvas->tqrepaint(); kdDebug(33001) << "KPrView::print zoom&res reset" << endl; - m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime()); + m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime()); m_pKPresenterDoc->recalcVariables( VT_DATE ); } @@ -632,7 +632,7 @@ void KPrView::editPaste() { // TODO: it would be nice to have no offset when pasting onto a different page... m_canvas->activePage()->pasteObjs( - data->tqencodedData(KoStoreDrag::mimeType("application/x-kpresenter")), + data->encodedData(KoStoreDrag::mimeType("application/x-kpresenter")), 1, 0.0, 0.0, 0.0, 20.0, 20.0); m_canvas->setMouseSelectedObject(true); @@ -644,7 +644,7 @@ void KPrView::editPaste() //TODO : fix me !! // TODO: it would be nice to have no offset when pasting onto a different page... //m_canvas->activePage()->pasteObjs( - //data->tqencodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")), + //data->encodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")), //1, 0.0, 0.0, 0.0, 20.0, 20.0); m_canvas->setMouseSelectedObject(true); @@ -1274,7 +1274,7 @@ void KPrView::extraShadow() if ( !shadowDia ) { shadowDia = new KPrShadowDialogImpl( this ); - shadowDia->resize( shadowDia->tqminimumSize() ); + shadowDia->resize( shadowDia->minimumSize() ); connect( shadowDia, TQT_SIGNAL( apply() ), TQT_TQOBJECT(this), TQT_SLOT( shadowOk() ) ); } @@ -1509,7 +1509,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) KProcess proc; proc << xdgScreenSaver; proc << "suspend"; - proc << TQString::number( tqtopLevelWidget()->winId() ); + proc << TQString::number( topLevelWidget()->winId() ); kdDebug() << k_funcinfo << proc.args() << endl; proc.start( KProcess::DontCare ); } else { @@ -1633,7 +1633,7 @@ void KPrView::screenStop() KProcess proc; proc << xdgScreenSaver; proc << "resume"; - proc << TQString::number( tqtopLevelWidget()->winId() ); + proc << TQString::number( topLevelWidget()->winId() ); kdDebug() << k_funcinfo << proc.args() << endl; proc.start( KProcess::DontCare ); } else { @@ -1856,7 +1856,7 @@ void KPrView::slotApplyFont() void KPrView::slotCounterStyleSelected() { - TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); if ( actionName.startsWith( "counterstyle_" ) ) { TQString styleStr = actionName.mid(13); @@ -2175,7 +2175,7 @@ void KPrView::createGUI() // setup page pageBase = new PageBase( splitterVertical, this ); - pageBase->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + pageBase->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); m_canvas=new KPrCanvas( pageBase, "Canvas", this ); @@ -3491,8 +3491,8 @@ void KPrView::reorganize() if(kPresenterDoc()->showRuler()) { - int hSpace = v_ruler->tqminimumSizeHint().width(); - int vSpace = h_ruler->tqminimumSizeHint().height(); + int hSpace = v_ruler->minimumSizeHint().width(); + int vSpace = h_ruler->minimumSizeHint().height(); m_canvas->move( hSpace, vSpace ); if ( h_ruler ) @@ -3552,8 +3552,8 @@ void PageBase::resizeEvent( TQResizeEvent *e ) TQSize s = e ? e->size() : size(); if ( view->m_bShowGUI ) { - int hSpace = view->getVRuler()->tqminimumSizeHint().width(); - int vSpace = view->getVRuler()->tqminimumSizeHint().height(); + int hSpace = view->getVRuler()->minimumSizeHint().width(); + int vSpace = view->getVRuler()->minimumSizeHint().height(); view->m_canvas->resize( s.width() - ( hSpace + 16 ), s.height() - ( vSpace + 16 ) ); view->vert->setGeometry( s.width() - 16, 0, 16, s.height() - 32 ); @@ -3778,8 +3778,8 @@ void KPrView::setupRulers() v_ruler = new KoRuler( pageBase, m_canvas, Qt::Vertical, kPresenterDoc()->pageLayout(), 0, kPresenterDoc()->unit() ); v_ruler->setReadWrite(kPresenterDoc()->isReadWrite()); - int hSpace = v_ruler->tqminimumSizeHint().width(); - int vSpace = h_ruler->tqminimumSizeHint().height(); + int hSpace = v_ruler->minimumSizeHint().width(); + int vSpace = h_ruler->minimumSizeHint().height(); m_canvas->resize( m_canvas->width() - hSpace, m_canvas->height() - vSpace ); m_canvas->move( hSpace, vSpace ); @@ -5968,7 +5968,7 @@ void KPrView::duplicateObj() TQCString clip_str = KoStoreDrag::mimeType("application/x-kpresenter"); if ( data->provides( clip_str ) ) { - m_canvas->activePage()->pasteObjs( data->tqencodedData(clip_str), + m_canvas->activePage()->pasteObjs( data->encodedData(clip_str), nbCopy, angle, increaseX,increaseY, moveX, moveY ); m_canvas->setMouseSelectedObject(true); emit objectSelectedChanged(); diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 2197cf32e..40ad82bee 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -211,7 +211,7 @@ void KPrWebPresentation::loadConfig() if ( num <= slideInfos.count() ) { for ( unsigned int i = 0; i < num; i++ ) { - TQString key = TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i ); + TQString key = TQString::fromLatin1( "SlideTitle%1" ).tqarg( i ); if ( cfg.hasKey( key ) ) { // We'll assume that the selected pages haven't changed... Hmm. @@ -245,7 +245,7 @@ void KPrWebPresentation::saveConfig() cfg.writeEntry( "Slides", slideInfos.count() ); for ( unsigned int i = 0; i < slideInfos.count(); i++ ) - cfg.writeEntry( TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i ), slideInfos[ i ].slideTitle ); + cfg.writeEntry( TQString::fromLatin1( "SlideTitle%1" ).tqarg( i ), slideInfos[ i ].slideTitle ); cfg.writeEntry( "BackColor", backColor ); cfg.writeEntry( "TitleColor", titleColor ); @@ -511,7 +511,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) else htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author )); streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" ) - .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) ); + .tqarg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).tqarg( htmlAuthor ) ); streamOut << " </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n"; } @@ -562,7 +562,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar ) TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) : TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author )); streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" ) - .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) ); + .tqarg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).tqarg( htmlAuthor ) ); streamOut << "</body>\n</html>\n"; file.close(); @@ -668,7 +668,7 @@ void KPrWebPresentationWizard::setupPage1() KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); helptext->setText( i18n( "Enter your name, email address and " "the title of the web presentation. " "Also enter the output directory where the " @@ -678,27 +678,27 @@ void KPrWebPresentationWizard::setupPage1() tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Author:"), canvas ); - label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n("This is where you enter the name of the person or " "organization that should be named as the author of " "the presentation.") ); tqlayout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n("Title:"), canvas ); - label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label2, i18n("This is where you enter the title of the overall " "presentation." ) ); tqlayout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n("Email address:"), canvas ); - label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label3, i18n("This is where you enter the email address of the " "person or organization that is responsible for " "the presentation.") ); tqlayout->addWidget( label3, 4, 0 ); TQLabel *label4 = new TQLabel( i18n("Path:"), canvas ); - label4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label4->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label4, i18n("The value entered for the path is the directory " "where the presentation will be saved. If it does " "not exist, you'll be asked if you want to create " @@ -766,7 +766,7 @@ void KPrWebPresentationWizard::setupPage2() KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); TQString help = i18n("Here you can configure the style of the web pages."); help += i18n( "You can also specify the zoom for the slides." ); helptext->setText(help); @@ -776,18 +776,18 @@ void KPrWebPresentationWizard::setupPage2() tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Zoom:"), canvas ); - label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the size of the slide image." ) ); tqlayout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n( "Encoding:" ), canvas ); - label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); tqlayout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n( "Document type:" ), canvas ); - label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); tqlayout->addWidget( label3, 4, 0 ); zoom = new KIntNumInput( webPres.getZoom(), canvas ); @@ -856,22 +856,22 @@ void KPrWebPresentationWizard::setupPage3() KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); helptext->setText( i18n( "Now you can customize the colors of the web pages." ) ); tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Text color:"), canvas ); - label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); tqlayout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n("Title color:"), canvas ); - label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); tqlayout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n("Background color:"), canvas ); - label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); tqlayout->addWidget( label3, 4, 0 ); textColor = new KColorButton( webPres.getTextColor(), canvas ); @@ -913,7 +913,7 @@ void KPrWebPresentationWizard::setupPage4() KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); helptext->setText( i18n( "Here you can specify titles for " "each slide. Click on a slide in " "the list and then enter the title " @@ -924,7 +924,7 @@ void KPrWebPresentationWizard::setupPage4() tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); TQLabel *label = new TQLabel( i18n( "Slide title:" ), canvas ); - label->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); tqlayout->addWidget( label, 1, 0 ); slideTitle = new KLineEdit( canvas ); @@ -981,7 +981,7 @@ void KPrWebPresentationWizard::setupPage5() KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); TQString help = i18n("Here you can configure some options for unattended " "presentations, such as time elapsed before automatically advance to " "the next slide, looping and the presence of headers."); @@ -992,7 +992,7 @@ void KPrWebPresentationWizard::setupPage5() tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Advance after:"), canvas ); - label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the time between slides." ) ); tqlayout->addWidget( label1, 2, 0 ); diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index ccbfc0e85..7043a692e 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -137,7 +137,7 @@ void AFChoose::setupTabs() continue; // Invalid .desktop file } } - grpPtr->loadWid->setBackgroundColor(tqcolorGroup().base()); + grpPtr->loadWid->setBackgroundColor(colorGroup().base()); grpPtr->loadWid->setResizeMode(TQIconView::Adjust); grpPtr->loadWid->sort(); connect(grpPtr->loadWid,TQT_SIGNAL(nameChanged(TQString)), @@ -148,7 +148,7 @@ void AFChoose::setupTabs() TQT_SLOT(slotDoubleClick())); grpPtr->label = new TQLabel(grpPtr->tab); grpPtr->label->setText(" "); - grpPtr->label->setMaximumHeight(grpPtr->label->tqsizeHint().height()); + grpPtr->label->setMaximumHeight(grpPtr->label->sizeHint().height()); addTab(grpPtr->tab,grpPtr->name); } } diff --git a/kpresenter/generalpropertyui.ui b/kpresenter/generalpropertyui.ui index eec430f15..1161f42b0 100644 --- a/kpresenter/generalpropertyui.ui +++ b/kpresenter/generalpropertyui.ui @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kpresenter/imageEffectBase.ui b/kpresenter/imageEffectBase.ui index 430bfac8d..84d388669 100644 --- a/kpresenter/imageEffectBase.ui +++ b/kpresenter/imageEffectBase.ui @@ -48,7 +48,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>200</height> @@ -336,7 +336,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> @@ -409,7 +409,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> @@ -471,7 +471,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>81</height> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>71</height> @@ -572,7 +572,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>111</height> @@ -621,7 +621,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>71</height> @@ -718,7 +718,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>111</height> @@ -767,7 +767,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>121</height> @@ -867,7 +867,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> @@ -946,7 +946,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> @@ -998,7 +998,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> @@ -1050,7 +1050,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>181</height> @@ -1102,7 +1102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>181</height> @@ -1148,7 +1148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>71</height> @@ -1200,7 +1200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>181</height> @@ -1246,7 +1246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>183</height> @@ -1325,7 +1325,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -1374,7 +1374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>81</height> @@ -1436,7 +1436,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> diff --git a/kpresenter/insertpagedia.ui b/kpresenter/insertpagedia.ui index 9d7372cf6..aecf704d2 100644 --- a/kpresenter/insertpagedia.ui +++ b/kpresenter/insertpagedia.ui @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpresenter/penstyle.ui b/kpresenter/penstyle.ui index bcbcca09a..56241f6f6 100644 --- a/kpresenter/penstyle.ui +++ b/kpresenter/penstyle.ui @@ -82,7 +82,7 @@ <property name="name"> <cstring>pbPreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>40</height> diff --git a/kpresenter/picturepropertyui.ui b/kpresenter/picturepropertyui.ui index 6812256cc..b1df2a2f1 100644 --- a/kpresenter/picturepropertyui.ui +++ b/kpresenter/picturepropertyui.ui @@ -131,7 +131,7 @@ <property name="name"> <cstring>picturePreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> diff --git a/kpresenter/piepropertyui.ui b/kpresenter/piepropertyui.ui index 854e31682..39c77f24e 100644 --- a/kpresenter/piepropertyui.ui +++ b/kpresenter/piepropertyui.ui @@ -56,7 +56,7 @@ <property name="name"> <cstring>piePreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> diff --git a/kpresenter/polygonpropertyui.ui b/kpresenter/polygonpropertyui.ui index 2b1b87ddf..dd0be8e67 100644 --- a/kpresenter/polygonpropertyui.ui +++ b/kpresenter/polygonpropertyui.ui @@ -42,7 +42,7 @@ <property name="name"> <cstring>polygonPreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> diff --git a/kpresenter/rectpropertyui.ui b/kpresenter/rectpropertyui.ui index ce16ef615..ff66c8b76 100644 --- a/kpresenter/rectpropertyui.ui +++ b/kpresenter/rectpropertyui.ui @@ -111,13 +111,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> @@ -142,7 +142,7 @@ <property name="name"> <cstring>rectPreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>100</height> diff --git a/kpresenter/rotationpropertyui.ui b/kpresenter/rotationpropertyui.ui index ea998478b..f54609ae8 100644 --- a/kpresenter/rotationpropertyui.ui +++ b/kpresenter/rotationpropertyui.ui @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -113,7 +113,7 @@ <property name="name"> <cstring>previewPanel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>160</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpresenter/shadowdialog.ui b/kpresenter/shadowdialog.ui index 44fc0e02f..9434c919d 100644 --- a/kpresenter/shadowdialog.ui +++ b/kpresenter/shadowdialog.ui @@ -336,7 +336,7 @@ <property name="name"> <cstring>previewPanel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>160</height> @@ -389,7 +389,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpresenter/slidetransitionwidget.ui b/kpresenter/slidetransitionwidget.ui index 2314d8b98..844424c26 100644 --- a/kpresenter/slidetransitionwidget.ui +++ b/kpresenter/slidetransitionwidget.ui @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>240</width> <height>180</height> @@ -276,7 +276,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>29</height> diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html index 31059876d..111842188 100644 --- a/kspread/DESIGN.html +++ b/kspread/DESIGN.html @@ -22,7 +22,7 @@ and the source code itself.</p> <h2>Document/View Architecture</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>MVC (Model/View/Controller) means that the application consists of three big parts, the <i>Model</i> which holds the data structure and objects, @@ -49,7 +49,7 @@ to some extent he can take most part of the KSpread back-end and glue a new user interface around the code.</p> <h2>Dependency Handling</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>When a cell holds a formula, then it is likely that it depends on other cell(s) for calculating the result. For example, if cell A11 has the formula @@ -181,7 +181,7 @@ and the dependency manager will do the rest. In addition, this gives us recursive dependency calculation at almost no cost.</p> <h2>Manipulators</h2> -<p>tqStatus: PLANNED.</p> +<p>Status: PLANNED.</p> <p>Currently, every operation on a cell or on a range of cells is quite complex. You need to ensure correct repainting, recalculation, iterate on a range and so on.</p> @@ -218,7 +218,7 @@ below.</p> accomplish this.</p> <h2>Selection handling</h2> -<p>tqStatus: PLANNED</p> +<p>Status: PLANNED</p> <p>The selection shall be an instance of some RangeList class, or however we want to call it - this will contain a list of @@ -227,7 +227,7 @@ more entries. This will allow easy implementation of CTRL-selections and so, because thanks to manipulators, each operation will automatically support these.</p> <h2>Repaint Triggering</h2> -<p>tqStatus: PLANNED</p> +<p>Status: PLANNED</p> <p>As mentioned above, the interface between the core and the GUI needs to be kept at minimum. Also, the number of repaints needs to be as low as possible, and repaints @@ -255,7 +255,7 @@ the manipulators that derive from it, so that it knows whether it changed cell's content or formatting.</p> <h2>Formula Engine</h2> -<p>tqStatus: FINISHED.</p> +<p>Status: FINISHED.</p> <p>This formula engine is just an expression evaluator. To offer better performance, the expression is first compiled into byte codes which will @@ -472,7 +472,7 @@ token right before the percent. If yes, then the following code is generated: <h2>Value</h2> -<p>tqStatus: FINISHED.<br> +<p>Status: FINISHED.<br> </p> <p>to be written.</p> @@ -480,7 +480,7 @@ token right before the percent. If yes, then the following code is generated: <h2>Commands Based on KCommand<br> </h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>Until lately, to implement undo and redo, KSpread creates corresponding KSpreadUndo classes for each action and runs them when the user undoes @@ -492,12 +492,12 @@ hence we should be able to undo/redo every operation (provided that the corresponding manipulator provides methods to store/recall the undo information).</p> <h2>Cell Storage</h2> -<p>tqStatus: PLANNED.</p> +<p>Status: PLANNED.</p> <p>Cells are grouped together, and then hashed.</p> <h2>Format Storage</h2> -<p>tqStatus: PLANNED.</p> +<p>Status: PLANNED.</p> <p>Formatting specifies how a cell should look like. It involves font attributes like bold or italics, vertical and horizontal tqalignment, @@ -589,7 +589,7 @@ be in more than one leaf in the quad-tree. <i>Details on the possible use of quad-tree or other methods should be explored further more</i>.</p> <h2>Default Toolbars</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>Relevant mailing-list threads:</p> @@ -652,7 +652,7 @@ Borders, Background, Foreground</li> </ul> <h2>Test Framework</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>Relevant mailing-list threads:</p> @@ -704,7 +704,7 @@ test cases.</p> </p> <h2>Coding Style</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>(to be written in details).</p> diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui index 6e7f7403c..b7ae7fb9a 100644 --- a/kspread/dialogs/font_cell_format.ui +++ b/kspread/dialogs/font_cell_format.ui @@ -168,7 +168,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc index 7c97f6c22..e326dd53c 100644 --- a/kspread/dialogs/kspread_dlg_angle.cc +++ b/kspread/dialogs/kspread_dlg_angle.cc @@ -55,7 +55,7 @@ AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker) lay->addWidget( m_pAngle ); TQWidget* spacer = new TQWidget( page ); - spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) ); + spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) ); lay->addWidget( spacer ); m_pAngle->setFocus(); diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc index 9a78074ba..e4e130e80 100644 --- a/kspread/dialogs/kspread_dlg_area.cc +++ b/kspread/dialogs/kspread_dlg_area.cc @@ -51,7 +51,7 @@ AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marke lay1->addWidget( label ); m_areaName = new TQLineEdit(page); - m_areaName->setMinimumWidth( m_areaName->tqsizeHint().width() * 3 ); + m_areaName->setMinimumWidth( m_areaName->sizeHint().width() * 3 ); lay1->addWidget( m_areaName ); m_areaName->setFocus(); diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc index 531f2ee3d..d03b72d77 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cc +++ b/kspread/dialogs/kspread_dlg_conditional.cc @@ -57,7 +57,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() ); groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() ); - groupBox1_3Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1_3Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" ); groupBox1_3Layout->addWidget( textLabel1_3, 0, 0 ); @@ -93,7 +93,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() ); - groupBox1_2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1_2Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" ); groupBox1_2Layout->addWidget( textLabel1_2, 0, 0 ); @@ -129,7 +129,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() ); - groupBox1_1Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1_1Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" ); groupBox1_1Layout->addWidget( textLabel1_1, 0, 0 ); @@ -158,7 +158,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags groupBox1_1Layout->addItem( spacer_6, 1, 3 ); Form1Layout->addWidget( groupBox1_1, 0, 0 ); - resize( TQSize(702, 380).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize(702, 380).expandedTo( minimumSizeHint() ) ); clearWState( WState_Polished ); TQStringList list; diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc index c8ce26715..dcc53a776 100644 --- a/kspread/dialogs/kspread_dlg_csv.cc +++ b/kspread/dialogs/kspread_dlg_csv.cc @@ -78,7 +78,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_targetRect.setBottom( lastCell->row() ); m_sheet = new TQTable( page, "m_table" ); - //m_sheet->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) ); + //m_sheet->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) ); m_sheet->setNumRows( 0 ); m_sheet->setNumCols( 0 ); @@ -86,13 +86,13 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod // Delimiter: comma, semicolon, tab, space, other m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" ); - m_delimiterBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); + m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); m_delimiterBox->setTitle( i18n( "Delimiter" ) ); m_delimiterBox->setColumnLayout(0, Qt::Vertical ); m_delimiterBox->tqlayout()->setSpacing( KDialog::spacingHint() ); m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() ); m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() ); - m_delimiterBoxLayout->tqsetAlignment( TQt::AlignTop ); + m_delimiterBoxLayout->setAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 ); m_ignoreDuplicates = new TQCheckBox( page, "m_ignoreDuplicates" ); @@ -122,20 +122,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_delimiterBoxLayout->addWidget( m_radioOther, 0, 2 ); m_delimiterEdit = new TQLineEdit( m_delimiterBox, "m_delimiterEdit" ); - m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); + m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) ); m_delimiterBoxLayout->addWidget( m_delimiterEdit, 1, 2 ); // Format: number, text, currency, m_formatBox = new TQButtonGroup( page, "m_formatBox" ); - m_formatBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); + m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); m_formatBox->setTitle( i18n( "Format" ) ); m_formatBox->setColumnLayout(0, Qt::Vertical ); m_formatBox->tqlayout()->setSpacing( KDialog::spacingHint() ); m_formatBox->tqlayout()->setMargin( KDialog::marginHint() ); m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() ); - m_formatBoxLayout->tqsetAlignment( TQt::AlignTop ); + m_formatBoxLayout->setAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 ); m_radioNumber = new TQRadioButton( m_formatBox, "m_radioNumber" ); @@ -157,7 +157,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" ); m_comboLine->insertItem( i18n( "1" ) ); - m_comboLine->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); + m_comboLine->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboLine, 1, 3 ); @@ -165,20 +165,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_comboQuote->insertItem( i18n( "\"" ) ); m_comboQuote->insertItem( i18n( "'" ) ); m_comboQuote->insertItem( i18n( "None" ) ); - m_comboQuote->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) ); + m_comboQuote->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboQuote, 1, 2 ); TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred ); MyDialogLayout->addItem( spacer_2, 2, 3 ); TextLabel3 = new TQLabel( page, "TextLabel3" ); - TextLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); + TextLabel3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); TextLabel3->setText( i18n( "Start at line:" ) ); MyDialogLayout->addWidget( TextLabel3, 0, 3 ); TextLabel2 = new TQLabel( page, "TextLabel2" ); - TextLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); + TextLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); TextLabel2->setText( i18n( "Textquote:" ) ); MyDialogLayout->addWidget( TextLabel2, 0, 2 ); @@ -200,7 +200,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_cancelled = true; return; } - m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) ); + m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) ); } else if ( mode == File ) { @@ -249,7 +249,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod fillSheet(); fillComboBox(); - resize(tqsizeHint()); + resize(sizeHint()); m_sheet->setSelectionMode(TQTable::NoSelection); diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index 7cf242a91..ca1ed59c4 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -139,16 +139,16 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame16Layout->addWidget( TextLabel5, 5, 0 ); Frame5Layout->addWidget( Frame16 ); - m_databasetqStatus = new TQLabel( Frame5, "m_databaseStatus" ); - m_databasetqStatus->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databasetqStatus->sizePolicy().hasHeightForWidth() ) ); - m_databasetqStatus->setMaximumSize( TQSize( 32767, 30 ) ); - m_databasetqStatus->setText( " " ); - Frame5Layout->addWidget( m_databasetqStatus ); + m_databaseStatus = new TQLabel( Frame5, "m_databaseStatus" ); + m_databaseStatus->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databaseStatus->sizePolicy().hasHeightForWidth() ) ); + m_databaseStatus->setMaximumSize( TQSize( 32767, 30 ) ); + m_databaseStatus->setText( " " ); + Frame5Layout->addWidget( m_databaseStatus ); m_databaseLayout->addWidget( Frame5, 0, 1 ); TQFrame * Frame17 = new TQFrame( m_database, "Frame17" ); - Frame17->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) ); + Frame17->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) ); Frame17->setMinimumSize( TQSize( 111, 0 ) ); Frame17->setFrameShape( TQFrame::NoFrame ); Frame17->setFrameShadow( TQFrame::Plain ); @@ -181,9 +181,9 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame5_2Layout->addLayout( Layout21, 0, 0 ); - m_sheettqStatus = new TQLabel( Frame5_2, "m_tableStatus" ); - m_sheettqStatus->setText( " " ); - Frame5_2Layout->addWidget( m_sheettqStatus, 3, 0 ); + m_sheetStatus = new TQLabel( Frame5_2, "m_tableStatus" ); + m_sheetStatus->setText( " " ); + Frame5_2Layout->addWidget( m_sheetStatus, 3, 0 ); m_SelectSheetLabel = new TQLabel( Frame5_2, "m_SelectSheetLabel" ); m_SelectSheetLabel->setText( i18n( "Select tables:" ) ); @@ -198,7 +198,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_sheetLayout->addWidget( Frame5_2, 0, 1 ); TQFrame * Frame17_2 = new TQFrame( m_sheet, "Frame17_2" ); - Frame17_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) ); + Frame17_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) ); Frame17_2->setMinimumSize( TQSize( 111, 0 ) ); Frame17_2->setFrameShape( TQFrame::NoFrame ); Frame17_2->setFrameShadow( TQFrame::Plain ); @@ -227,14 +227,14 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame5_2_2Layout->addWidget( m_columnView, 1, 0 ); - m_columnstqStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" ); - m_columnstqStatus->setText( " " ); - Frame5_2_2Layout->addWidget( m_columnstqStatus, 2, 0 ); + m_columnsStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" ); + m_columnsStatus->setText( " " ); + Frame5_2_2Layout->addWidget( m_columnsStatus, 2, 0 ); m_columnsLayout->addWidget( Frame5_2_2, 0, 1 ); TQFrame * Frame17_3 = new TQFrame( m_columns, "Frame17_3" ); - Frame17_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) ); + Frame17_3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) ); Frame17_3->setMinimumSize( TQSize( 111, 0 ) ); Frame17_3->setFrameShape( TQFrame::NoFrame ); Frame17_3->setFrameShadow( TQFrame::Plain ); @@ -353,7 +353,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_optionsLayout->addWidget( optionsFrame, 0, 1 ); TQFrame * Frame17_4 = new TQFrame( m_options, "Frame17_4" ); - Frame17_4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) ); + Frame17_4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) ); Frame17_4->setMinimumSize( TQSize( 111, 0 ) ); Frame17_4->setFrameShape( TQFrame::NoFrame ); Frame17_4->setFrameShadow( TQFrame::Plain ); @@ -402,7 +402,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_resultLayout->addWidget( Frame5_2_2_3, 0, 1 ); TQFrame * Frame17_5 = new TQFrame( m_result, "Frame17_5" ); - Frame17_5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) ); + Frame17_5->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) ); Frame17_5->setMinimumSize( TQSize( 111, 0 ) ); Frame17_5->setFrameShape( TQFrame::NoFrame ); Frame17_5->setFrameShadow( TQFrame::Plain ); @@ -717,10 +717,10 @@ bool DatabaseDialog::databaseDoNext() m_dbConnection->setPort( port ); } - m_databasetqStatus->setText( i18n("Connecting to database...") ); + m_databaseStatus->setText( i18n("Connecting to database...") ); if ( m_dbConnection->open() ) { - m_databasetqStatus->setText( i18n("Connected. Retrieving table information...") ); + m_databaseStatus->setText( i18n("Connected. Retrieving table information...") ); TQStringList sheetList( m_dbConnection->tables() ); if ( sheetList.isEmpty() ) @@ -741,7 +741,7 @@ bool DatabaseDialog::databaseDoNext() } m_sheetView->setEnabled( true ); - m_databasetqStatus->setText( " " ); + m_databaseStatus->setText( " " ); } else { @@ -759,7 +759,7 @@ bool DatabaseDialog::databaseDoNext() errorMsg.append( error.databaseText() ); errorMsg.append( "\n" ); } - m_databasetqStatus->setText( " " ); + m_databaseStatus->setText( " " ); KMessageBox::error( this, errorMsg ); return false; @@ -768,7 +768,7 @@ bool DatabaseDialog::databaseDoNext() else { KMessageBox::error( this, i18n("Driver could not be loaded") ); - m_databasetqStatus->setText( " " ); + m_databaseStatus->setText( " " ); return false; } setNextEnabled(m_sheet, true); @@ -778,7 +778,7 @@ bool DatabaseDialog::databaseDoNext() bool DatabaseDialog::sheetsDoNext() { - m_databasetqStatus->setText( i18n("Retrieving meta data of tables...") ); + m_databaseStatus->setText( i18n("Retrieving meta data of tables...") ); TQStringList sheets; for (TQListViewItem * item = (TQCheckListItem *) m_sheetView->firstChild(); item; item = item->nextSibling()) diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h index 6e82adc30..9334935c9 100644 --- a/kspread/dialogs/kspread_dlg_database.h +++ b/kspread/dialogs/kspread_dlg_database.h @@ -88,7 +88,7 @@ class DatabaseDialog : public KWizard TQSqlDatabase * m_dbConnection; TQWidget * m_database; - TQLabel * m_databasetqStatus; + TQLabel * m_databaseStatus; TQLineEdit * m_username; TQLineEdit * m_port; TQLineEdit * m_databaseName; @@ -99,12 +99,12 @@ class DatabaseDialog : public KWizard TQWidget * m_sheet; TQComboBox * m_databaseList; KPushButton * m_connectButton; - TQLabel * m_sheettqStatus; + TQLabel * m_sheetStatus; TQLabel * m_SelectSheetLabel; KListView * m_sheetView; TQWidget * m_columns; KListView * m_columnView; - TQLabel * m_columnstqStatus; + TQLabel * m_columnsStatus; TQWidget * m_options; TQComboBox * m_columns_1; TQComboBox * m_columns_2; diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc index d63bfd690..0a2226541 100644 --- a/kspread/dialogs/kspread_dlg_find.cc +++ b/kspread/dialogs/kspread_dlg_find.cc @@ -120,7 +120,7 @@ FindDlg::FindDlg(TQWidget *parent, const char *name, long options, const TQStrin { m_findOptions = new FindOption( findExtension() ); connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } FindDlg::~FindDlg() @@ -144,7 +144,7 @@ SearchDlg::SearchDlg(TQWidget *parent, const char *name, long options, const TQS { m_findOptions = new FindOption( findExtension() ); connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } SearchDlg::~SearchDlg() diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc index 62e637f51..0f0a356c0 100644 --- a/kspread/dialogs/kspread_dlg_formula.cc +++ b/kspread/dialogs/kspread_dlg_formula.cc @@ -87,7 +87,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for searchFunct = new KLineEdit(page); TQSizePolicy sp3( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); - searchFunct->tqsetSizePolicy( sp3 ); + searchFunct->setSizePolicy( sp3 ); grid1->addWidget( searchFunct, 0, 0 ); @@ -99,7 +99,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for functions = new TQListBox(page); TQSizePolicy sp1( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); - functions->tqsetSizePolicy( sp1 ); + functions->setSizePolicy( sp1 ); grid1->addWidget( functions, 2, 0 ); selectFunction = new TQPushButton( page ); @@ -112,7 +112,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for m_tabwidget = new TQTabWidget( page ); TQSizePolicy sp2( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - m_tabwidget->tqsetSizePolicy( sp2 ); + m_tabwidget->setSizePolicy( sp2 ); grid1->addMultiCellWidget( m_tabwidget, 0, 2, 1, 1 ); m_browser = new TQTextBrowser( m_tabwidget ); diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc index 8902cf6cb..a52d4df94 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cc +++ b/kspread/dialogs/kspread_dlg_goalseek.cc @@ -152,7 +152,7 @@ GoalSeekDialog::GoalSeekDialog( View * parent, TQPoint const & marker, m_resultText = new TQLabel( m_resultFrame, "m_resultText" ); m_resultText->setText( "Goal seeking with cell <cell> found <a | no> solution:" ); - m_resultText->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_resultText->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_resultFrameLayout->addMultiCellWidget( m_resultText, 0, 0, 0, 1 ); diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index 53942457b..27e278681 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -78,7 +78,7 @@ PatternSelect::PatternSelect( TQWidget *parent, const char * ) { penStyle = Qt::NoPen; penWidth = 1; - penColor = tqcolorGroup().text(); + penColor = colorGroup().text(); selected = false; undefined = false; } @@ -160,7 +160,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) groupBox->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() ); - groupBoxLayout->tqsetAlignment( TQt::AlignTop ); + groupBoxLayout->setAlignment( TQt::AlignTop ); TQLabel * label1 = new TQLabel( groupBox, "label1" ); label1->setText( i18n( "Name:" ) ); @@ -207,7 +207,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) m_parentBox->setEnabled( false ); } - resize( TQSize( 534, 447 ).expandedTo(tqminimumSizeHint()) ); + resize( TQSize( 534, 447 ).expandedTo(minimumSizeHint()) ); } GeneralTab::~GeneralTab() @@ -886,12 +886,12 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y) void CellFormatDialog::init() { - TQColorGroup tqcolorGroup = TQApplication::tqpalette().active(); + TQColorGroup colorGroup = TQApplication::tqpalette().active(); // Did we initialize the bitmaps ? if ( formatOnlyNegSignedPixmap == 0L ) { - TQColor black = tqcolorGroup.text(); // not necessarily black :) + TQColor black = colorGroup.text(); // not necessarily black :) formatOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", black ); formatRedOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", TQt::red ); formatRedNeverSignedPixmap = paintFormatPixmap( "123.456", black, "123.456", TQt::red ); @@ -1465,8 +1465,8 @@ void CellFormatPageFloat::init() TQString tmp; TQString tmp2; TQDate tmpDate( 2000,2,18); - list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), true); - list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), false); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), true); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), false); ValueFormatter *fmt = dlg->getDoc()->formatter(); @@ -2164,10 +2164,10 @@ void CellFormatPageFont::setCombos() if ( dlg->bTextColor ) textColor = dlg->textColor; else - textColor = tqcolorGroup().text(); + textColor = colorGroup().text(); if ( !textColor.isValid() ) - textColor =tqcolorGroup().text(); + textColor =colorGroup().text(); textColorButton->setColor( textColor ); @@ -2533,7 +2533,7 @@ BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton { penStyle = Qt::NoPen; penWidth = 1; - penColor = tqcolorGroup().text(); + penColor = colorGroup().text(); setToggleButton( true ); setOn( false); setChanged(false); @@ -2549,7 +2549,7 @@ void BorderButton::setUndefined() { setPenStyle(Qt::SolidLine ); setPenWidth(1); - setColor(tqcolorGroup().midlight()); + setColor(colorGroup().midlight()); } @@ -2558,7 +2558,7 @@ void BorderButton::unselect() setOn(false); setPenWidth(1); setPenStyle(Qt::NoPen); - setColor( tqcolorGroup().text() ); + setColor( colorGroup().text() ); setChanged(true); } @@ -2586,7 +2586,7 @@ void Border::paintEvent( TQPaintEvent *_ev ) TQPen pen; TQPainter painter; painter.begin( this ); - pen=TQPen( tqcolorGroup().midlight(),2,SolidLine); + pen=TQPen( colorGroup().midlight(),2,SolidLine); painter.setPen( pen ); painter.drawLine( OFFSETX-5, OFFSETY, OFFSETX , OFFSETY ); @@ -2682,14 +2682,14 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Border") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,6,5,KDialog::marginHint(), KDialog::spacingHint()); int fHeight = tmpTQGroupBox->fontMetrics().height(); grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title area=new Border(tmpTQGroupBox,"area",dlg->oneCol,dlg->oneRow); grid2->addMultiCellWidget(area,2,4,1,3); - area->setBackgroundColor( tqcolorGroup().base() ); + area->setBackgroundColor( colorGroup().base() ); /* initailize the buttons that are in this box */ for (int i=BorderType_Top; i < BorderType_END; i++) @@ -2709,7 +2709,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_3" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Preselect") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,1,3,KDialog::marginHint(), KDialog::spacingHint()); @@ -2748,7 +2748,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_10" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Pattern") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,7,2,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -2804,7 +2804,7 @@ void CellFormatPageBorder::InitializeGrids() style->insertItem(paintFormatPixmap(DashDotLine),2 ); style->insertItem(paintFormatPixmap(DashDotDotLine),3 ); style->insertItem(paintFormatPixmap(SolidLine),4); - style->setBackgroundColor( tqcolorGroup().background() ); + style->setBackgroundColor( colorGroup().background() ); grid2->addMultiCell(grid3,6,6,0,1); grid->addMultiCellWidget(tmpTQGroupBox,0,3,1,1); @@ -2813,7 +2813,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox(this, "GroupBox_4" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Preview") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,1,1,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -2970,9 +2970,9 @@ TQPixmap CellFormatPageBorder::paintFormatPixmap(PenStyle _style) TQPixmap pixmap( style->width(), 14 ); TQPainter painter; TQPen pen; - pen=TQPen( tqcolorGroup().text(),1,_style); + pen=TQPen( colorGroup().text(),1,_style); painter.begin( &pixmap ); - painter.fillRect( 0, 0, style->width(), 14, tqcolorGroup().background() ); + painter.fillRect( 0, 0, style->width(), 14, colorGroup().background() ); painter.setPen( pen ); painter.drawLine( 0, 7, style->width(), 7 ); painter.end(); @@ -3240,7 +3240,7 @@ void CellFormatPageBorder::changeState( BorderButton *_p) { _p->setPenWidth(1); _p->setPenStyle(Qt::NoPen); - _p->setColor( tqcolorGroup().text() ); + _p->setColor( colorGroup().text() ); } area->tqrepaint(); @@ -3567,7 +3567,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog tmpTQGroupBox = new TQGroupBox( this, "GroupBox_20" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Pattern") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); TQGridLayout *grid2 = new TQGridLayout(tmpTQGroupBox,8,3,KDialog::marginHint(), KDialog::spacingHint()); int fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -3656,10 +3656,10 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog if ( dlg->bBgColor ) bgColor = dlg->bgColor; else - bgColor = tqcolorGroup().base(); + bgColor = colorGroup().base(); if (!bgColor.isValid()) - bgColor = tqcolorGroup().base(); + bgColor = colorGroup().base(); bgColorButton->setColor( bgColor ); connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ), @@ -3678,7 +3678,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog tmpTQGroupBox = new TQGroupBox( this, "GroupBox1" ); tmpTQGroupBox->setTitle( i18n("Preview") ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,2,1,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -3753,8 +3753,8 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog void CellFormatPagePattern::slotNotAnyColor() { b_notAnyColor = true; - bgColorButton->setColor( tqcolorGroup().base() ); - current->setBackgroundColor( tqcolorGroup().base() ); + bgColorButton->setColor( colorGroup().base() ); + current->setBackgroundColor( colorGroup().base() ); } void CellFormatPagePattern::slotSetBackgroundColor( const TQColor &_color ) diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index 51ca3cdc9..9d223e195 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -194,8 +194,8 @@ void parameterLocale::updateToMatchLocale(KLocale* locale) { m_language->setText( i18n("Language: %1").tqarg( locale->language() )); m_number->setText( i18n("Default number format: %1").tqarg( locale->formatNumber(12.55) )); - m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ))); - m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ,true) )); + m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::currentDate() ))); + m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::currentDate() ,true) )); m_time->setText( i18n("Time format: %1").tqarg( locale->formatTime( TQTime::currentTime() ) )); m_money->setText( i18n("Currency format: %1").tqarg( locale->formatMoney(12.55) )); } @@ -905,7 +905,7 @@ configureSpellPage::configureSpellPage( View* _view,TQVBox *box , char *name ) TQWhatsThis::add(dontCheckTitleCase, i18n( "Check this box if you want the spellchecker to ignore the title case, for example My Own Spreadsheet or My own spreadsheet. If this is unchecked, the spell checker will ask for a uppercase letter in the title nouns." ) ); TQWidget* spacer = new TQWidget( box ); - spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); if( config->hasGroup("KSpell kspread") ) { diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc index c456efb3f..1587e866a 100644 --- a/kspread/dialogs/kspread_dlg_reference.cc +++ b/kspread/dialogs/kspread_dlg_reference.cc @@ -254,7 +254,7 @@ EditAreaName::EditAreaName( View * parent, m_pView = parent; resize( 350, 142 ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)4, 0, 0, sizePolicy().hasHeightForWidth() ) ); diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index 1e58ccf5d..e903fcd55 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -111,7 +111,7 @@ SortDialog::SortDialog( View * parent, const char * name, sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() ); sort1Box->tqlayout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() ); - sort1BoxLayout->tqsetAlignment( TQt::AlignTop ); + sort1BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" ); sort1BoxLayout->addWidget( m_sortKey1 ); @@ -130,7 +130,7 @@ SortDialog::SortDialog( View * parent, const char * name, sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() ); sort2Box->tqlayout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() ); - sort2BoxLayout->tqsetAlignment( TQt::AlignTop ); + sort2BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" ); m_sortKey2->insertItem( i18n( "None" ) ); @@ -150,7 +150,7 @@ SortDialog::SortDialog( View * parent, const char * name, sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() ); sort3Box->tqlayout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() ); - sort3BoxLayout->tqsetAlignment( TQt::AlignTop ); + sort3BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" ); m_sortKey3->insertItem( i18n( "None" ) ); @@ -171,7 +171,7 @@ SortDialog::SortDialog( View * parent, const char * name, m_page2 = new TQWidget( m_tabWidget, "m_page2" ); TQGridLayout * page2Layout = new TQGridLayout( m_page2, 1, 1, 11, 6, "page2Layout"); - page2Layout->tqsetAlignment(TQt::AlignTop); + page2Layout->setAlignment(TQt::AlignTop); TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" ); firstKeyBox->setTitle( i18n( "First Key" ) ); @@ -179,7 +179,7 @@ SortDialog::SortDialog( View * parent, const char * name, firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() ); firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() ); TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() ); - firstKeyBoxLayout->tqsetAlignment( TQt::AlignTop ); + firstKeyBoxLayout->setAlignment( TQt::AlignTop ); m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" ); m_useCustomLists->setText( i18n( "&Use custom list" ) ); @@ -206,7 +206,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() ); - resultToBoxLayout->tqsetAlignment( TQt::AlignTop ); + resultToBoxLayout->setAlignment( TQt::AlignTop ); TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet"); destinationSheet->setText("Destination Sheet:"); diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index 32a5474a6..787aac7cc 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -59,7 +59,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) m_displayBox->insertItem( i18n( "Custom Styles" ) ); m_displayBox->insertItem( i18n( "Hierarchical" ) ); connect( m_styleList, TQT_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQT_SIGNAL( modifyStyle())); - resize( TQSize(446, 384).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(446, 384).expandedTo(minimumSizeHint()) ); } StyleWidget::~StyleWidget() diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc index 8f61c5d8b..79445e549 100644 --- a/kspread/dialogs/kspread_dlg_validity.cc +++ b/kspread/dialogs/kspread_dlg_validity.cc @@ -367,8 +367,8 @@ void DlgValidity::changeIndexType(int _index) } break; } - if ( width() < tqsizeHint().width() ) - resize( tqsizeHint() ); + if ( width() < sizeHint().width() ) + resize( sizeHint() ); } void DlgValidity::changeIndexCond(int _index) diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui index cb73b12dc..341d72a96 100644 --- a/kspread/dialogs/kspreadsubtotal.ui +++ b/kspread/dialogs/kspreadsubtotal.ui @@ -195,7 +195,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>152</height> diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc index aba1a170c..23cf3317a 100644 --- a/kspread/dialogs/link.cc +++ b/kspread/dialogs/link.cc @@ -105,7 +105,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) fLayout->add( d->fileLink ); fLayout->add( new TQLabel( i18n("Recent file:" ), d->filePage ) ); TQComboBox* recentFile = new TQComboBox( d->filePage ); - recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); fLayout->add( recentFile ); fLayout->addItem( new TQSpacerItem( 0, 40, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); connect( d->fileText, TQT_SIGNAL( textChanged( const TQString& ) ), this, diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui index df2ff2113..ced662513 100644 --- a/kspread/dialogs/position_cell_format.ui +++ b/kspread/dialogs/position_cell_format.ui @@ -298,7 +298,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>20</height> @@ -358,7 +358,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui index 0768d4f72..cb66f102f 100644 --- a/kspread/dialogs/protection_cell_format.ui +++ b/kspread/dialogs/protection_cell_format.ui @@ -95,7 +95,7 @@ Note that you can print it even if the cell is protected</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>21</height> @@ -136,7 +136,7 @@ Note that you can print it even if the cell is protected</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc index 69397687c..7cdd64493 100644 --- a/kspread/dialogs/sheet_properties.cc +++ b/kspread/dialogs/sheet_properties.cc @@ -39,7 +39,7 @@ SheetPropertiesDialog::SheetPropertiesDialog( TQWidget* parent ): TQVBox* mainWidget = makeVBoxMainWidget(); d = new SheetPropertiesBase( mainWidget ); TQWidget* spacer = new TQWidget( mainWidget ); - spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); + spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); enableButtonSeparator( true ); } diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui index 0750b8a9a..89f314a78 100644 --- a/kspread/dialogs/sheet_properties_base.ui +++ b/kspread/dialogs/sheet_properties_base.ui @@ -99,7 +99,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -118,7 +118,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc index 3f482e273..6b7e191f4 100644 --- a/kspread/kspread_canvas.cc +++ b/kspread/kspread_canvas.cc @@ -547,7 +547,7 @@ void Canvas::validateSelection() ypos = sheet->dblRowPos( moveY ); } //d->validationInfo->setGeometry( 3, y + 3, len + 2, hei + 2 ); - d->validationInfo->tqsetAlignment( TQt::AlignVCenter ); + d->validationInfo->setAlignment( TQt::AlignVCenter ); TQPainter painter; painter.begin( this ); int len = 0; @@ -1816,7 +1816,7 @@ void Canvas::dropEvent( TQDropEvent * _ev ) } - b = _ev->tqencodedData( TextDrag::selectionMimeType() ); + b = _ev->encodedData( TextDrag::selectionMimeType() ); sheet->paste( b, TQRect( col, row, 1, 1 ), makeUndo ); if ( _ev->source() == this ) @@ -3440,22 +3440,22 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU ) { top = true; -// snaptqStatus |= KoGuides::SNAP_HORIZ; +// snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD ) { bottom = true; -// snaptqStatus |= KoGuides::SNAP_HORIZ; +// snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD ) { left = true; -// snaptqStatus |= KoGuides::SNAP_VERT; +// snapStatus |= KoGuides::SNAP_VERT; } if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD ) { right = true; -// snaptqStatus |= KoGuides::SNAP_VERT; +// snapStatus |= KoGuides::SNAP_VERT; } double newLeft = objRect.left(); @@ -3572,7 +3572,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep // { // sp.setY( rect.bottom() ); // } -// m_gl.repaintSnapping( sp, snaptqStatus ); +// m_gl.repaintSnapping( sp, snapStatus ); // } tqrepaint( oldBoundingRect ); @@ -4064,7 +4064,7 @@ void Canvas::paintUpdates() } else { - matrix = painter.tqworldMatrix(); + matrix = painter.worldMatrix(); } @@ -4656,7 +4656,7 @@ VBorder::~VBorder() delete m_scrollTimer; } -TQSize VBorder::tqsizeHint() const +TQSize VBorder::sizeHint() const { return TQSize( 40, 10 ); } @@ -5057,7 +5057,7 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime ) else m_lSize->setGeometry( 3, y + 3, len + 2,hei + 2 ); - m_lSize->tqsetAlignment( TQt::AlignVCenter ); + m_lSize->setAlignment( TQt::AlignVCenter ); m_lSize->setText( tmpSize ); m_lSize->setPalette( TQToolTip::palette() ); m_lSize->show(); @@ -5095,7 +5095,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev ) TQColor highlightColor = View::highlightColor(); TQPen pen( TQt::black, 1 ); painter.setPen( pen ); - // painter.setBackgroundColor( tqcolorGroup().base() ); + // painter.setBackgroundColor( colorGroup().base() ); // painter.eraseRect( _ev->rect() ); @@ -5146,7 +5146,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev ) } else { - TQColor c = tqcolorGroup().background(); + TQColor c = colorGroup().background(); TQBrush fill( c ); qDrawPlainRect ( &painter, 0, zoomedYPos, width, height+1, c.dark(150), 1, &fill ); @@ -5156,10 +5156,10 @@ void VBorder::paintEvent( TQPaintEvent* _ev ) // Reset painter painter.setFont( normalFont ); - painter.setPen( tqcolorGroup().text() ); + painter.setPen( colorGroup().text() ); if ( selected ) - painter.setPen( tqcolorGroup().highlightedText() ); + painter.setPen( colorGroup().highlightedText() ); else if ( highlighted ) painter.setFont( boldFont ); @@ -5212,7 +5212,7 @@ HBorder::~HBorder() delete m_scrollTimer; } -TQSize HBorder::tqsizeHint() const +TQSize HBorder::sizeHint() const { return TQSize( 40, 10 ); } @@ -5758,7 +5758,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime ) else m_lSize->setGeometry( x + 3, 3, len + 2, hei + 2 ); - m_lSize->tqsetAlignment( TQt::AlignVCenter ); + m_lSize->setAlignment( TQt::AlignVCenter ); m_lSize->setText( tmpSize ); m_lSize->setPalette( TQToolTip::palette() ); m_lSize->show(); @@ -5866,7 +5866,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) } else { - TQColor c = tqcolorGroup().background(); + TQColor c = colorGroup().background(); TQBrush fill( c ); qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150), 1, &fill ); @@ -5874,10 +5874,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) // Reset painter painter.setFont( normalFont ); - painter.setPen( tqcolorGroup().text() ); + painter.setPen( colorGroup().text() ); if ( selected ) - painter.setPen( tqcolorGroup().highlightedText() ); + painter.setPen( colorGroup().highlightedText() ); else if ( highlighted ) painter.setFont( boldFont ); if ( !m_pView->activeSheet()->getShowColumnNumber() ) @@ -5929,7 +5929,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) } else { - TQColor c = tqcolorGroup().background(); + TQColor c = colorGroup().background(); TQBrush fill( c ); qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150), 1, &fill ); @@ -5937,10 +5937,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) // Reset painter painter.setFont( normalFont ); - painter.setPen( tqcolorGroup().text() ); + painter.setPen( colorGroup().text() ); if ( selected ) - painter.setPen( tqcolorGroup().highlightedText() ); + painter.setPen( colorGroup().highlightedText() ); else if ( highlighted ) painter.setFont( boldFont ); if ( !m_pView->activeSheet()->getShowColumnNumber() ) @@ -5991,7 +5991,7 @@ ToolTip::ToolTip( Canvas* canvas ) // this is a hack of course, because it's not available from TQToolTip TQLabel *tip_findLabel() { - TQWidgetList *list = TQApplication::tqallWidgets(); + TQWidgetList *list = TQApplication::allWidgets(); TQWidgetListIt it( *list ); TQWidget * w; while ( (w=it.current()) != 0 ) diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h index f5aa67469..ce6c3feb6 100644 --- a/kspread/kspread_canvas.h +++ b/kspread/kspread_canvas.h @@ -586,7 +586,7 @@ public: void updateColumns( int from, int to ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; private slots: void doAutoScroll(); @@ -672,7 +672,7 @@ public: void equalizeRow( double resize ); void updateRows( int from, int to ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; private slots: void doAutoScroll(); diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc index fdcf38be6..705f77b4b 100644 --- a/kspread/kspread_cell.cc +++ b/kspread/kspread_cell.cc @@ -2498,7 +2498,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, */ if ( d->style == Cell::ST_Button ) { TQBrush fill( TQt::lightGray ); - TQApplication::style().tqdrawControl( TQStyle::CE_PushButton, &_painter, this, + TQApplication::style().drawControl( TQStyle::CE_PushButton, &_painter, this, TQRect( _tx + 1, _ty + 1, w2 - 1, h2 - 1 ), defaultColorGroup ); //, selected, &fill ); } @@ -6744,8 +6744,8 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op ) if( inside_tag ) { inside_tag = false; - if( tag.tqstartsWith( "a href=\"", true ) ) - if( tag.tqendsWith( "\"" ) ) + if( tag.startsWith( "a href=\"", true ) ) + if( tag.endsWith( "\"" ) ) qml_link = tag.mid( 8, tag.length()-9 ); tag = TQString(); } diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index 188dbe2ee..c277e9917 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -1656,12 +1656,12 @@ void Doc::paintContent( TQPainter& painter, const TQRect& rect, if ( m_zoomedResolutionX != zoomX ) d_zoom *= ( zoomX / m_zoomedResolutionX ); - // KSpread support zoom, therefore no need to scale with tqworldMatrix - TQWMatrix matrix = painter.tqworldMatrix(); + // KSpread support zoom, therefore no need to scale with worldMatrix + TQWMatrix matrix = painter.worldMatrix(); matrix.setMatrix( 1, 0, 0, 1, matrix.dx(), matrix.dy() ); TQRect prect = rect; - prect.setWidth( (int) (prect.width() * painter.tqworldMatrix().m11()) ); - prect.setHeight( (int) (prect.height() * painter.tqworldMatrix().m22()) ); + prect.setWidth( (int) (prect.width() * painter.worldMatrix().m11()) ); + prect.setHeight( (int) (prect.height() * painter.worldMatrix().m22()) ); setZoomAndResolution( (int) ( d_zoom * 100 ), KoGlobal::dpiX(), KoGlobal::dpiY() ); // paint the content, now zoom is correctly set kdDebug(36001)<<"paintContent-------------------------------------\n"; @@ -1746,7 +1746,7 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect, - view->canvasWidget()->yOffset() ); } else { - matrix = painter.tqworldMatrix(); + matrix = painter.worldMatrix(); } // TQPtrListIterator<KoDocumentChild> it( tqchildren() ); diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc index ddf41d317..721412ca2 100644 --- a/kspread/kspread_editors.cc +++ b/kspread/kspread_editors.cc @@ -315,11 +315,11 @@ TQObject( editor ) d->editor = editor; d->hintLabel = 0; - d->completionPopup = new TQVBox( editor->tqtopLevelWidget(), 0, WType_Popup ); + d->completionPopup = new TQVBox( editor->topLevelWidget(), 0, WType_Popup ); d->completionPopup->setFrameStyle( TQFrame::Box | TQFrame::Plain ); d->completionPopup->setLineWidth( 1 ); d->completionPopup->installEventFilter( this ); - d->completionPopup->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum); + d->completionPopup->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum); d->completionListBox = new KListBox( d->completionPopup ); d->completionPopup->setFocusProxy( d->completionListBox ); @@ -430,7 +430,7 @@ void FunctionCompletion::showCompletion( const TQStringList &choices ) // size of the pop-up d->completionPopup->setMaximumHeight( 100 ); - d->completionPopup->resize( d->completionListBox->tqsizeHint() + + d->completionPopup->resize( d->completionListBox->sizeHint() + TQSize( d->completionListBox->verticalScrollBar()->width() + 4, d->completionListBox->horizontalScrollBar()->height() + 4 ) ); int h = d->completionListBox->height(); @@ -612,7 +612,7 @@ void CellEditor::triggerFunctionAutoComplete() TQStringList fnames = KSpread::FunctionRepository::self()->functionNames(); TQStringList choices; for( unsigned i=0; i<fnames.count(); i++ ) - if( fnames[i].tqstartsWith( id, false ) ) + if( fnames[i].startsWith( id, false ) ) choices.append( fnames[i] ); choices.sort(); diff --git a/kspread/kspread_functions_conversion.cc b/kspread/kspread_functions_conversion.cc index 422468380..dc15cddc1 100644 --- a/kspread/kspread_functions_conversion.cc +++ b/kspread/kspread_functions_conversion.cc @@ -168,7 +168,7 @@ Value func_roman (valVector args, ValueCalc *calc, FuncExtra *) if ((value < 0) || (value > 3999)) return Value::errorNA(); TQString result; - result = TQString::tqfromLatin1 (RNThousands[(value / 1000)] + + result = TQString::fromLatin1 (RNThousands[(value / 1000)] + RNHundreds[(value / 100) % 10] + RNTens[(value / 10 ) % 10] + RNUnits[(value) % 10]); diff --git a/kspread/kspread_functions_datetime.cc b/kspread/kspread_functions_datetime.cc index b139057d9..0136d298c 100644 --- a/kspread/kspread_functions_datetime.cc +++ b/kspread/kspread_functions_datetime.cc @@ -32,8 +32,8 @@ using namespace KSpread; // prototypes, sorted -Value func_tqcurrentDate (valVector args, ValueCalc *calc, FuncExtra *); -Value func_tqcurrentDateTime (valVector args, ValueCalc *calc, FuncExtra *); +Value func_currentDate (valVector args, ValueCalc *calc, FuncExtra *); +Value func_currentDateTime (valVector args, ValueCalc *calc, FuncExtra *); Value func_currentTime (valVector args, ValueCalc *calc, FuncExtra *); Value func_date (valVector args, ValueCalc *calc, FuncExtra *); Value func_datevalue (valVector args, ValueCalc *calc, FuncExtra *); @@ -77,10 +77,10 @@ void RegisterDateTimeFunctions() FunctionRepository* repo = FunctionRepository::self(); Function *f; - f = new Function ("CURRENTDATE", func_tqcurrentDate); + f = new Function ("CURRENTDATE", func_currentDate); f->setParamCount (0); repo->add (f); - f = new Function ("CURRENTDATETIME", func_tqcurrentDateTime); + f = new Function ("CURRENTDATETIME", func_currentDateTime); f->setParamCount (0); repo->add (f); f = new Function ("CURRENTTIME", func_currentTime); @@ -140,7 +140,7 @@ void RegisterDateTimeFunctions() f = new Function ("MONTHS", func_months); f->setParamCount (3); repo->add (f); - f = new Function ("NOW", func_tqcurrentDateTime); + f = new Function ("NOW", func_currentDateTime); f->setParamCount (0); repo->add (f); f = new Function ("SECOND", func_second); @@ -154,7 +154,7 @@ void RegisterDateTimeFunctions() repo->add (f); f = new Function ("TIMEVALUE", func_timevalue); repo->add (f); - f = new Function ("TODAY", func_tqcurrentDate); + f = new Function ("TODAY", func_currentDate); f->setParamCount (0); repo->add (f); f = new Function ("WEEKDAY", func_weekday); @@ -519,7 +519,7 @@ Value func_monthname (valVector args, ValueCalc *calc, FuncExtra *) int number = calc->conv()->asInteger (args[0]).asInteger(); TQString monthName = calc->conv()->locale()->calendar()->monthName (number, - TQDate::tqcurrentDate().year()); + TQDate::currentDate().year()); if (monthName.isNull()) return Value::errorVALUE(); return Value (monthName); @@ -555,10 +555,10 @@ Value func_time (valVector args, ValueCalc *calc, FuncExtra *) return Value (TQTime (h, m, s)); } -// Function: tqcurrentDate -Value func_tqcurrentDate (valVector, ValueCalc *, FuncExtra *) +// Function: currentDate +Value func_currentDate (valVector, ValueCalc *, FuncExtra *) { - return Value (TQDate::tqcurrentDate ()); + return Value (TQDate::currentDate ()); } // Function: currentTime @@ -567,10 +567,10 @@ Value func_currentTime (valVector, ValueCalc *, FuncExtra *) return Value (TQTime::currentTime ()); } -// Function: tqcurrentDateTime -Value func_tqcurrentDateTime (valVector, ValueCalc *, FuncExtra *) +// Function: currentDateTime +Value func_currentDateTime (valVector, ValueCalc *, FuncExtra *) { - return Value (TQDateTime::tqcurrentDateTime ()); + return Value (TQDateTime::currentDateTime ()); } // Function: dayOfYear diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc index 7d55a8ff3..73370e03c 100644 --- a/kspread/kspread_map.cc +++ b/kspread/kspread_map.cc @@ -159,7 +159,7 @@ void Map::loadOasisSettings( KoOasisSettings &settings ) void Map::saveOasisSettings( KoXmlWriter &settingsWriter ) { - settingsWriter.addConfigItem( "ViewId", TQString::tqfromLatin1( "View1" ) ); + settingsWriter.addConfigItem( "ViewId", TQString::fromLatin1( "View1" ) ); // Save visual info for the first view, such as active sheet and active cell // It looks like a hack, but reopening a document creates only one view anyway (David) View * view = m_doc->views().isEmpty() ? 0 : dynamic_cast<View*>(m_doc->views().getFirst()); diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc index 9257a3f57..82ee585f6 100644 --- a/kspread/kspread_object.cc +++ b/kspread/kspread_object.cc @@ -1015,7 +1015,7 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); image.setKey(key); KoStore* store = context.store(); diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc index 09abcf8aa..0e7f7bcc9 100644 --- a/kspread/kspread_sheet.cc +++ b/kspread/kspread_sheet.cc @@ -222,12 +222,12 @@ TextDrag::~TextDrag() } -TQByteArray TextDrag::tqencodedData( const char * mime ) const +TQByteArray TextDrag::encodedData( const char * mime ) const { if ( strcmp( selectionMimeType(), mime ) == 0) return m_kspread; else - return TQTextDrag::tqencodedData( mime ); + return TQTextDrag::encodedData( mime ); } bool TextDrag::canDecode( TQMimeSource* e ) @@ -5125,11 +5125,11 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo, if ( mime->provides( TextDrag::selectionMimeType() ) ) { - b = mime->tqencodedData( TextDrag::selectionMimeType() ); + b = mime->encodedData( TextDrag::selectionMimeType() ); } else if( mime->provides( "text/plain" ) ) { - // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" ) + // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). Copied from KPresenter ;-) TQString _text = TQApplication::tqclipboard()->text( clipboardMode ); doc()->emitBeginOperation(); @@ -5152,7 +5152,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo, void Sheet::pasteTextPlain( TQString &_text, TQRect pasteArea) { // TQString tmp; -// tmp= TQString::fromLocal8Bit(_mime->tqencodedData( "text/plain" )); +// tmp= TQString::fromLocal8Bit(_mime->encodedData( "text/plain" )); if( _text.isEmpty() ) return; @@ -5530,7 +5530,7 @@ bool Sheet::testAreaPasteInsert()const TQByteArray b; if ( mime->provides( "application/x-kspread-snippet" ) ) - b = mime->tqencodedData( "application/x-kspread-snippet" ); + b = mime->encodedData( "application/x-kspread-snippet" ); else return false; @@ -7171,7 +7171,7 @@ void Sheet::convertPart( const TQString & part, KoXmlWriter & xmlWriter ) const TQDomElement t = dd.createElement( "text:date" ); t.setAttribute( "text:date-value", "0-00-00" ); // todo: "style:data-style-name", "N2" - t.appendChild( dd.createTextNode( TQDate::tqcurrentDate().toString() ) ); + t.appendChild( dd.createTextNode( TQDate::currentDate().toString() ) ); parent.appendChild( t ); #endif } diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h index 5d907810a..2947728cc 100644 --- a/kspread/kspread_sheet.h +++ b/kspread/kspread_sheet.h @@ -160,7 +160,7 @@ public: void setPlain( TQString const & _plain ) { setText( _plain ); } void setKSpread( TQByteArray const & _kspread ) { m_kspread = _kspread; } - virtual TQByteArray tqencodedData( const char * mime ) const; + virtual TQByteArray encodedData( const char * mime ) const; virtual const char* format( int i ) const; static bool canDecode( TQMimeSource * e ); @@ -1018,7 +1018,7 @@ public: void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _tqgeometry ); - const TQColorGroup& tqcolorGroup() { return widget()->tqcolorGroup(); } + const TQColorGroup& colorGroup() { return widget()->colorGroup(); } int id() const; diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc index c3c12117e..6f9a4f8b9 100644 --- a/kspread/kspread_sheetprint.cc +++ b/kspread/kspread_sheetprint.cc @@ -1273,7 +1273,7 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ fileName=""; TQString t(TQTime::currentTime().toString()); - TQString d(TQDate::tqcurrentDate().toString()); + TQString d(TQDate::currentDate().toString()); TQString ta; if ( !_sheet.isEmpty() ) ta = _sheet; diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc index 06e7a6891..8a483154e 100644 --- a/kspread/kspread_toolbox.cc +++ b/kspread/kspread_toolbox.cc @@ -59,7 +59,7 @@ void ToolBox::setEnabled( bool enable ) } else { - if ( tqfocusWidget() == this ) + if ( focusWidget() == this ) focusNextPrevChild( TRUE ); TQObjectList clo = childrenListObject(); if ( !clo.isEmpty() ) @@ -97,7 +97,7 @@ void ToolBox::childEvent( TQChildEvent* ev ) { if ( ev->inserted() && ev->child()->isWidgetType() ) m_layout->addWidget( (TQWidget*)ev->child() ); - resize( tqsizeHint() ); + resize( sizeHint() ); } void ToolBox::mousePressEvent( TQMouseEvent* ev ) diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index cb947f34e..89c5ff351 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -1968,8 +1968,8 @@ void View::initView() d->hBorderWidget = new HBorder( this, d->canvas,this ); d->vBorderWidget = new VBorder( this, d->canvas ,this ); - d->hBorderWidget->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - d->vBorderWidget->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + d->hBorderWidget->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + d->vBorderWidget->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); d->canvas->setFocusPolicy( TQ_StrongFocus ); TQWidget::setFocusPolicy( TQ_StrongFocus ); @@ -4143,7 +4143,7 @@ void View::paste() { canvasWidget()->deselectAllObjects(); TQCString returnedTypeMime = "application/vnd.oasis.opendocument.spreadsheet"; - const TQByteArray arr = data->tqencodedData( returnedTypeMime ); + const TQByteArray arr = data->encodedData( returnedTypeMime ); if( arr.isEmpty() ) return; TQBuffer buffer( arr ); @@ -5896,7 +5896,7 @@ void View::slotListChoosePopupMenu( ) if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft ) { - p2.setX( p2.x() - d->popupListChoose->tqsizeHint().width() + 1 ); + p2.setX( p2.x() - d->popupListChoose->sizeHint().width() + 1 ); } d->popupListChoose->popup( p2 ); @@ -7209,7 +7209,7 @@ void View::transformPart() if ( d->transformToolBox.isNull() ) { - d->transformToolBox = new KoTransformToolBox( selectedChild(), tqtopLevelWidget() ); + d->transformToolBox = new KoTransformToolBox( selectedChild(), topLevelWidget() ); d->transformToolBox->show(); d->transformToolBox->setDocumentChild( selectedChild() ); diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index 4c80e7b49..730cd4046 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -80,7 +80,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char // Create the display calc_display = new DLabel( this, "display" ); calc_display->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken ); - calc_display->tqsetAlignment( AlignRight|AlignVCenter ); + calc_display->setAlignment( AlignRight|AlignVCenter ); calc_display->setFocus(); calc_display->setFocusPolicy( TQ_StrongFocus ); @@ -89,18 +89,18 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char statusINVLabel = new TQLabel( this, "INV" ); Q_CHECK_PTR( statusINVLabel ); statusINVLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statusINVLabel->tqsetAlignment( AlignCenter ); + statusINVLabel->setAlignment( AlignCenter ); statusINVLabel->setText("NORM"); statusHYPLabel = new TQLabel( this, "HYP" ); Q_CHECK_PTR( statusHYPLabel ); statusHYPLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statusHYPLabel->tqsetAlignment( AlignCenter ); + statusHYPLabel->setAlignment( AlignCenter ); statusERRORLabel = new TQLabel( this, "ERROR" ); Q_CHECK_PTR( statusERRORLabel ); statusERRORLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statusERRORLabel->tqsetAlignment( AlignLeft|AlignVCenter ); + statusERRORLabel->setAlignment( AlignLeft|AlignVCenter ); // create angle button group @@ -586,7 +586,7 @@ void TQtCalculator::updateGeometry() if( o->isWidgetType() ) { margin = TQApplication::style(). - tqpixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2; + pixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2; ((TQWidget*)o)->setMinimumSize(s.width()+margin, s.height()+margin); ((TQWidget*)o)->installEventFilter( this ); ((TQWidget*)o)->setAcceptDrops(true); @@ -595,11 +595,11 @@ void TQtCalculator::updateGeometry() l = (TQObjectList*)mLargePage->tqchildren(); // silence please - int h1 = pbF->tqminimumSize().height(); + int h1 = pbF->minimumSize().height(); int h2 = (int)((((float)h1 + 4.0) / 5.0)); s.setWidth(mLargePage->fontMetrics().width("MMM") + TQApplication::style(). - tqpixelMetric(TQStyle::PM_ButtonMargin, pbF)*2); + pixelMetric(TQStyle::PM_ButtonMargin, pbF)*2); s.setHeight(h1 + h2); for(uint i = 0; i < l->count(); i++) @@ -621,7 +621,7 @@ void TQtCalculator::updateGeometry() statusINVLabel->setMinimumWidth(s.width()); statusHYPLabel->setMinimumWidth(s.width()); - //setFixedSize(tqminimumSize()); + //setFixedSize(minimumSize()); } void TQtCalculator::exit() @@ -1494,10 +1494,10 @@ void TQtCalculator::configclicked(){ "enabled. See the README for details."); #endif - label->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs); + label->setAlignment(AlignLeft|WordBreak|ExpandTabs); label->setText(labelstring); - label2->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs); + label2->setAlignment(AlignLeft|WordBreak|ExpandTabs); label2->setText(labelstring2); // HACK @@ -1540,7 +1540,7 @@ void TQtCalculator::configclicked(){ set_precision(); set_style(); updateGeometry(); - resize(tqminimumSize()); + resize(minimumSize()); } delete configdlg; } diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc index d55c332b6..0311c9137 100644 --- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc +++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc @@ -40,7 +40,7 @@ InsertCalendarDialog::InsertCalendarDialog(TQWidget* parent, const char* name) //we start with a default calendar for the current month; - TQDate first_day_in_month = TQDate::tqcurrentDate(); + TQDate first_day_in_month = TQDate::currentDate(); first_day_in_month.setYMD(first_day_in_month.year(),first_day_in_month.month(),1); TQDate last_day_in_month(first_day_in_month.year(),first_day_in_month.month(),first_day_in_month.daysInMonth()); diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui index 712b11b4f..d2c8fc085 100644 --- a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui +++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>400</width> <height>19</height> diff --git a/kspread/plugins/scripting/scripting.cc b/kspread/plugins/scripting/scripting.cc index 44f8fa014..a919b31d9 100644 --- a/kspread/plugins/scripting/scripting.cc +++ b/kspread/plugins/scripting/scripting.cc @@ -43,9 +43,9 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) setInstance(KSpreadScriptingFactory::instance()); kdDebug() << "Scripting plugin. Class: " - << tqmetaObject()->className() + << metaObject()->className() << ", Parent: " - << parent->tqmetaObject()->className() + << parent->metaObject()->className() << "\n"; if ( parent->inherits("KSpread::View") ) diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc index 53fe60b3c..0c9e9e97e 100644 --- a/kspread/tests/testrunner.cc +++ b/kspread/tests/testrunner.cc @@ -67,8 +67,8 @@ TestRunner::TestRunner(): d->testType = new KComboBox( mainWidget ); tqlayout->addWidget( d->testType, 0, 1 ); - TQSpacerItem* tqspacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout->addItem( tqspacerItem, 0, 2 ); + TQSpacerItem* spacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + tqlayout->addItem( spacerItem, 0, 2 ); d->runButton = new KPushButton( "Run", mainWidget ); tqlayout->addWidget( d->runButton, 0, 3 ); diff --git a/kspread/valueconverter.cc b/kspread/valueconverter.cc index 8dda86d17..cd649c367 100644 --- a/kspread/valueconverter.cc +++ b/kspread/valueconverter.cc @@ -228,11 +228,11 @@ Value ValueConverter::asDateTime (const Value &value) const switch (value.type()) { case Value::Empty: - val.setValue (TQDateTime::tqcurrentDateTime()); + val.setValue (TQDateTime::currentDateTime()); break; case Value::Boolean: //ignore the bool value... any better idea? ;) - val.setValue (TQDateTime::tqcurrentDateTime()); + val.setValue (TQDateTime::currentDateTime()); break; case Value::Integer: val.setValue (value.asFloat()); @@ -269,11 +269,11 @@ Value ValueConverter::asDate (const Value &value) const switch (value.type()) { case Value::Empty: - val.setValue (TQDate::tqcurrentDate()); + val.setValue (TQDate::currentDate()); break; case Value::Boolean: //ignore the bool value... any better idea? ;) - val.setValue (TQDate::tqcurrentDate()); + val.setValue (TQDate::currentDate()); break; case Value::Integer: val.setValue (value.asFloat()); diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp index 923323cb8..850b7a73a 100644 --- a/kugar/lib/inputmask.cpp +++ b/kugar/lib/inputmask.cpp @@ -210,13 +210,13 @@ bool InputMask::isValidInput( TQChar key, TQChar mask ) const TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) const { if ( pos >= ( uint ) m_maxLength ) - return TQString::tqfromLatin1( "" ); + return TQString::fromLatin1( "" ); TQString fill; fill = clear ? clearString( 0, m_maxLength ) : m_text; uint strIndex = 0; - TQString s = TQString::tqfromLatin1( "" ); + TQString s = TQString::fromLatin1( "" ); int i = pos; while ( i < m_maxLength ) { diff --git a/kugar/lib/mpagedisplay.cpp b/kugar/lib/mpagedisplay.cpp index 12eac741e..4f4b1869c 100644 --- a/kugar/lib/mpagedisplay.cpp +++ b/kugar/lib/mpagedisplay.cpp @@ -45,7 +45,7 @@ void MPageDisplay::setPageDimensions( TQSize size ) // Return the preferred size of the display. -TQSize MPageDisplay::tqsizeHint() const +TQSize MPageDisplay::sizeHint() const { return buffer.size(); } diff --git a/kugar/lib/mpagedisplay.h b/kugar/lib/mpagedisplay.h index 65a419d57..919d8a361 100644 --- a/kugar/lib/mpagedisplay.h +++ b/kugar/lib/mpagedisplay.h @@ -42,7 +42,7 @@ public: /** Sets the page display dimensions */ void setPageDimensions( TQSize size ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy() const; protected: diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp index 4e1544d30..77f402ed7 100644 --- a/kugar/lib/mreportengine.cpp +++ b/kugar/lib/mreportengine.cpp @@ -289,7 +289,7 @@ MPageCollection* MReportEngine::renderReport() // Initialize the basic page data currHeight = pageHeight - ( topMargin + bottomMargin + pFooter.getHeight() ); currPage = 0; - currDate = TQDate::tqcurrentDate(); + currDate = TQDate::currentDate(); // Initialise global report variables unsigned int rowCount = records.length(); @@ -336,7 +336,7 @@ MPageCollection* MReportEngine::renderReport() { // Update status event if ( ( chkRow = ( j / 2 ) % 20 ) == 0 ) - emit signalRendertqStatus( j / 2 ); + emit signalRenderStatus( j / 2 ); // Check for cancel action if ( cancelRender ) @@ -481,7 +481,7 @@ MPageCollection* MReportEngine::renderReport() pages->setPageOrientation( pageOrientation ); // Send final status - emit signalRendertqStatus( rowCount / 2 ); + emit signalRenderStatus( rowCount / 2 ); m_needRegeneration = false; m_pageCollection = pages; return pages; diff --git a/kugar/lib/mreportengine.h b/kugar/lib/mreportengine.h index 33b651cc0..aaf361075 100644 --- a/kugar/lib/mreportengine.h +++ b/kugar/lib/mreportengine.h @@ -71,7 +71,7 @@ public slots: void slotCancelRendering(); signals: - void signalRendertqStatus( int ); + void signalRenderStatus( int ); void preferedTemplate( const TQString & ); protected: diff --git a/kugar/lib/mreportsection.cpp b/kugar/lib/mreportsection.cpp index 1184d7739..5040d64c3 100644 --- a/kugar/lib/mreportsection.cpp +++ b/kugar/lib/mreportsection.cpp @@ -24,7 +24,7 @@ MReportSection::MReportSection() frequency = MReportSection::EveryPage; // Set special field data - reportDate = TQDate::tqcurrentDate(); + reportDate = TQDate::currentDate(); pageNumber = 0; // Set the line list to AutoDelete diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp index a3fd9ab5d..9e7f02d11 100644 --- a/kugar/lib/mreportviewer.cpp +++ b/kugar/lib/mreportviewer.cpp @@ -38,7 +38,7 @@ void MReportViewer::init() scroller = new TQScrollView( this ); // Connect the rendering update signal and slot - connect( rptEngine, TQT_SIGNAL( signalRendertqStatus( int ) ), + connect( rptEngine, TQT_SIGNAL( signalRenderStatus( int ) ), TQT_SLOT( slotRenderProgress( int ) ) ); connect( rptEngine, TQT_SIGNAL( preferedTemplate( const TQString & ) ), @@ -273,9 +273,9 @@ void MReportViewer::slotRenderProgress( int p ) // Return the preferred size. -TQSize MReportViewer::tqsizeHint() const +TQSize MReportViewer::sizeHint() const { - return scroller -> tqsizeHint(); + return scroller -> sizeHint(); } void MReportViewer::printReport( KPrinter &printer ) diff --git a/kugar/lib/mreportviewer.h b/kugar/lib/mreportviewer.h index 599e22dbf..ca47b12b2 100644 --- a/kugar/lib/mreportviewer.h +++ b/kugar/lib/mreportviewer.h @@ -59,7 +59,7 @@ public: void setupPrinter( KPrinter &printer ); void printReportSilent( int printFrom = -1, int printTo = -1, int printCopies = -1, TQString printerName = TQString() ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: void slotFirstPage(); diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index fdd6eb6ba..00fe2a85c 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -1751,7 +1751,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) break; case TQt::Key_M: // 'M' -> mark debug output { - const TQDateTime dtMark ( TQDateTime::tqcurrentDateTime() ); + const TQDateTime dtMark ( TQDateTime::currentDateTime() ); kdDebug(32002) << "Developer mark: " << dtMark.toString("yyyy-MM-dd hh:mm:ss,zzz") << endl; keyev->accept(); break; diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 977ff3222..d0a45a01a 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -75,7 +75,7 @@ using namespace KSpell2; // (Note: KDialogBase should have version of the methods that take a TQString for the icon name) static inline TQPixmap loadIcon( const char * name ) { return KGlobal::instance()->iconLoader() - ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } KWConfig::KWConfig( KWView* parent ) diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp index 8cfa8975a..d15c78c0f 100644 --- a/kword/KWConfigFootNoteDia.cpp +++ b/kword/KWConfigFootNoteDia.cpp @@ -82,7 +82,7 @@ void KWConfigFootNoteDia::setupTab3() TQWhatsThis::add(positionGroupBox, comment); positionGroupBox->setColumnLayout(0, Qt::Vertical ); TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->tqlayout() ); - positionLayout->tqsetAlignment( TQt::AlignTop ); + positionLayout->setAlignment( TQt::AlignTop ); // i18n context information necessary for gender considerations (e.g. in Polish) rbPosLeft = new TQRadioButton( i18n("Position", "Left"), positionGroupBox, "rbPosLeft" ); diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp index 12f7b3b59..f710e12d7 100644 --- a/kword/KWDeleteDia.cpp +++ b/kword/KWDeleteDia.cpp @@ -74,8 +74,8 @@ void KWDeleteDia::setupTab1() { } TQLabel *rc = new TQLabel( message , tab1 ); - rc->resize( rc->tqsizeHint() ); - rc->tqsetAlignment( AlignLeft | AlignBottom ); + rc->resize( rc->sizeHint() ); + rc->setAlignment( AlignLeft | AlignBottom ); grid1->addWidget( rc, 1, 0 ); } diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h index 2eb4eb9d5..87ac0f6f1 100644 --- a/kword/KWDocStruct.h +++ b/kword/KWDocStruct.h @@ -290,7 +290,7 @@ public: void setup(); void refreshTree(int _type); - TQSize tqminimumSizeHint() const { + TQSize minimumSizeHint() const { return TQSize( 0, 0 ); } void selectItem(); diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 9420f0481..5a60f3265 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -2804,7 +2804,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S if ( saveFlag == SaveAll ) pictureList = savePictureList(); - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); // for "current time" recalcVariables( VT_STATISTIC ); @@ -3235,7 +3235,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle buffer.close(); if ( m_pageColumns.columns > 1 ) { - buffer.tqsetBufferFromCopy(TQByteArray()); // clear data + buffer.setBuffer(TQByteArray()); // clear data buffer.open( IO_WriteOnly ); KoXmlWriter columnsTmpWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level columnsTmpWriter.startElement( "style:columns" ); @@ -3405,7 +3405,7 @@ void KWDocument::saveOasisBody( KoXmlWriter& writer, KoSavingContext& context ) TQDomDocument KWDocument::saveXML() { - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); // for "current time" recalcVariables( VT_STATISTIC ); @@ -5395,7 +5395,7 @@ void KWDocument::setEmpty() { KoDocument::setEmpty(); // Whether loaded from template or from empty doc: this is a new one -> set creation date - m_varColl->variableSetting()->setCreationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setCreationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); // , VST_CREATION_DATE ... // If we then load a document, it will override that date. } diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index 3638301db..281bf033b 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -51,16 +51,16 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch form1Layout->addLayout( hortqlayout1, 0, 1 ); TQGroupBox *expressionGroupBox = new TQGroupBox( page, "expressionGroupBox" ); - expressionGroupBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) ); + expressionGroupBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) ); expressionGroupBox->setTitle( i18n( "Expressions" ) ); expressionGroupBox->setColumnLayout(0, Qt::Vertical ); expressionGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() ); expressionGroupBox->tqlayout()->setMargin( KDialog::marginHint() ); TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->tqlayout() ); - expressionGroupBoxLayout->tqsetAlignment( TQt::AlignTop ); + expressionGroupBoxLayout->setAlignment( TQt::AlignTop ); m_ExpressionsList = new TQListBox( expressionGroupBox, "listOfExpressions" ); - m_ExpressionsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) ); + m_ExpressionsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) ); expressionGroupBoxLayout->addWidget( m_ExpressionsList ); m_expressionLineEdit = new TQLineEdit( expressionGroupBox, "expressionLineEdit" ); diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index 2d9cb4235..ab0bea651 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -67,7 +67,7 @@ void KWBrushStylePreview::drawContents( TQPainter* painter ) { painter->save(); painter->translate( contentsRect().x(), contentsRect().y() ); - painter->fillRect( contentsRect(), tqcolorGroup().base() ); // in case of a transparent brush + painter->fillRect( contentsRect(), colorGroup().base() ); // in case of a transparent brush painter->fillRect( contentsRect(), brush ); painter->restore(); } @@ -519,13 +519,13 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options m_sideGrid = new TQGridLayout( m_sideHeads, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); sideTitle1 = new TQLabel ( i18n("Size (%1):").tqarg(m_doc->unitName()),m_sideHeads); - sideTitle1->resize(sideTitle1->tqsizeHint()); + sideTitle1->resize(sideTitle1->sizeHint()); m_sideGrid->addWidget(sideTitle1,1,0); m_sideWidth= new TQLineEdit(m_sideHeads,""); m_sideWidth->setMaxLength(6); m_sideGrid->addWidget(m_sideWidth,1,1); sideTitle2 = new TQLabel( i18n("Gap size (%1):").tqarg(m_doc->unitName()),m_sideHeads); - sideTitle2->resize(sideTitle2->tqsizeHint()); + sideTitle2->resize(sideTitle2->sizeHint()); m_sideGrid->addWidget(sideTitle2,2,0); m_sideGap = new TQLineEdit(m_sideHeads,""); m_sideGap->setMaxLength(6); @@ -536,7 +536,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options m_sideAlign->insertItem ( i18n("Right")); m_sideAlign->insertItem ( i18n("Closest to Binding")); m_sideAlign->insertItem ( i18n("Closest to Page Edge")); - m_sideAlign->resize(m_sideAlign->tqsizeHint()); + m_sideAlign->resize(m_sideAlign->sizeHint()); m_sideGrid->addMultiCellWidget(m_sideAlign,3,3,0,1); m_sideGrid->addRowSpacing( 0, KDialog::marginHint() + 5 ); @@ -616,7 +616,7 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround m_runGroup->setColumnLayout( 0, Qt::Vertical ); m_runGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->tqlayout() ); - groupBox1Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1Layout->setAlignment( TQt::AlignTop ); m_rRunNo = new TQRadioButton( i18n( "Text will run &through this frame" ), m_runGroup ); groupBox1Layout->addWidget( m_rRunNo, 0, 1 ); @@ -653,7 +653,7 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround m_runSideGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); m_runSideGroup->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->tqlayout() ); - runSideLayout->tqsetAlignment( TQt::AlignTop ); + runSideLayout->setAlignment( TQt::AlignTop ); m_rRunLeft = new TQRadioButton( i18n( "Run Around", "&Left" ), m_runSideGroup ); runSideLayout->addWidget( m_rRunLeft, 0, 0 /*1*/ ); @@ -961,43 +961,43 @@ void KWFrameDia::setupTab4() { // TAB Geometry TQGridLayout* pGrid = new TQGridLayout( m_grp1, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); m_lx = new TQLabel( i18n( "Left:" ), m_grp1 ); - m_lx->resize( m_lx->tqsizeHint() ); + m_lx->resize( m_lx->sizeHint() ); pGrid->addWidget( m_lx, 1, 0 ); m_sx = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - m_sx->resize( m_sx->tqsizeHint() ); + m_sx->resize( m_sx->sizeHint() ); pGrid->addWidget( m_sx, 1, 1 ); m_ly = new TQLabel( i18n( "Top:" ), m_grp1 ); - m_ly->resize( m_ly->tqsizeHint() ); + m_ly->resize( m_ly->sizeHint() ); pGrid->addWidget( m_ly, 1, 2 ); m_sy = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - m_sy->resize( m_sy->tqsizeHint() ); + m_sy->resize( m_sy->sizeHint() ); pGrid->addWidget( m_sy, 1, 3 ); m_lw = new TQLabel( i18n( "Width:" ), m_grp1 ); - m_lw->resize( m_lw->tqsizeHint() ); + m_lw->resize( m_lw->sizeHint() ); pGrid->addWidget( m_lw, 2, 0 ); m_sw = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - m_sw->resize( m_sw->tqsizeHint() ); + m_sw->resize( m_sw->sizeHint() ); connect( m_sw, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotUpdateHeightForWidth(double)) ); pGrid->addWidget( m_sw, 2, 1 ); m_lh = new TQLabel( i18n( "Height:" ), m_grp1 ); - m_lh->resize( m_lh->tqsizeHint() ); + m_lh->resize( m_lh->sizeHint() ); pGrid->addWidget( m_lh, 2, 2 ); m_sh = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); connect( m_sh, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotUpdateWidthForHeight(double)) ); - m_sh->resize( m_sh->tqsizeHint() ); + m_sh->resize( m_sh->sizeHint() ); pGrid->addWidget( m_sh, 2, 3 ); @@ -2397,7 +2397,7 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& mGrid->addMultiCellWidget( m_synchronize, 1, 1, 0, 1 ); TQLabel* lml = new TQLabel( i18n( "Left:" ), grp2 ); - //lml->resize( lml->tqsizeHint() ); + //lml->resize( lml->sizeHint() ); mGrid->addWidget( lml, 2, 0 ); m_inputLeft = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); @@ -2405,31 +2405,31 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& mGrid->addWidget( m_inputLeft, 2, 1 ); TQLabel* lmt = new TQLabel( i18n( "Top:" ), grp2 ); - //lmt->resize( lmt->tqsizeHint() ); + //lmt->resize( lmt->sizeHint() ); mGrid->addWidget( lmt, 2, 2 ); m_inputTop = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); - //m_inputTop->resize( m_inputTop->tqsizeHint() ); + //m_inputTop->resize( m_inputTop->sizeHint() ); mGrid->addWidget( m_inputTop, 2, 3 ); TQLabel* lmr = new TQLabel( i18n( "Right:" ), grp2 ); - //lmr->resize( lmr->tqsizeHint() ); + //lmr->resize( lmr->sizeHint() ); mGrid->addWidget( lmr, 3, 0 ); m_inputRight = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); - //m_inputRight->resize( m_inputRight->tqsizeHint() ); + //m_inputRight->resize( m_inputRight->sizeHint() ); mGrid->addWidget( m_inputRight, 3, 1 ); TQLabel* lmb = new TQLabel( i18n( "Bottom:" ), grp2 ); - //lmb->resize( lmb->tqsizeHint() ); + //lmb->resize( lmb->sizeHint() ); mGrid->addWidget( lmb, 3, 2 ); m_inputBottom = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); - //m_inputBottom->resize( m_inputBottom->tqsizeHint() ); + //m_inputBottom->resize( m_inputBottom->sizeHint() ); mGrid->addWidget( m_inputBottom, 3, 3 ); mGrid->setRowSpacing( 0, KDialog::spacingHint() + 5 ); diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp index 816afa9b8..65ae6fbb0 100644 --- a/kword/KWFrameStyle.cpp +++ b/kword/KWFrameStyle.cpp @@ -32,7 +32,7 @@ #include <tqdom.h> KWFrameStyleCollection::KWFrameStyleCollection() - : KoUserStyleCollection( TQString::tqfromLatin1( "frame" ) ) + : KoUserStyleCollection( TQString::fromLatin1( "frame" ) ) { } diff --git a/kword/KWFrameStyle.h b/kword/KWFrameStyle.h index 3336daa2d..23dede0ec 100644 --- a/kword/KWFrameStyle.h +++ b/kword/KWFrameStyle.h @@ -98,7 +98,7 @@ class KWFrameStyleCollection : public KoUserStyleCollection public: KWFrameStyleCollection(); - static TQString defaultStyleName() { return TQString::tqfromLatin1( "Plain" ); } + static TQString defaultStyleName() { return TQString::fromLatin1( "Plain" ); } /** * Find style based on the untranslated name @p name. diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index 781e9e8ff..709308601 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -240,22 +240,22 @@ void KWFrameStyleManager::addGeneralTab() TQGridLayout *previewLayout = new TQGridLayout( previewBox->tqlayout() ); preview = new KWFrameStylePreview( previewBox ); - preview->resize(preview->tqsizeHint()); + preview->resize(preview->sizeHint()); previewLayout->addWidget( preview, 0, 0 ); tabLayout->addMultiCellWidget( previewBox, 1, 1, 0, 1 ); m_nameString = new TQLineEdit( tab ); - m_nameString->resize(m_nameString->tqsizeHint() ); + m_nameString->resize(m_nameString->sizeHint() ); connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); TQLabel *nameLabel = new TQLabel( tab ); nameLabel->setText( i18n( "Name:" ) ); - nameLabel->resize(nameLabel->tqsizeHint()); - nameLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nameLabel->resize(nameLabel->sizeHint()); + nameLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( nameLabel, 0, 0 ); diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index e477f5021..ee4b919fb 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -60,7 +60,7 @@ KWMailMergeDataBase::KWMailMergeDataBase( KWDocument *doc_ ) TQStringList KWMailMergeDataBase::availablePlugins() { TQStringList tmp; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),TQString()); + KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),TQString()); for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) { tmp.append((*it)->property("X-KDE-InternalName").toString()); @@ -79,7 +79,7 @@ bool KWMailMergeDataBase::loadPlugin(const TQString &name,const TQString &comman if (rejectdcopcall)return false; TQString constrain=TQString("[X-KDE-InternalName] =='"+name+"'"); kdDebug()<<constrain<<endl; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain); + KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); KService::Ptr it=pluginOffers.first(); TQVariant verProp=it->property("X-KDE-PluginVersion"); @@ -118,7 +118,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version) KWMailMergeDataSource *ret=0; TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").tqarg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text)); kdDebug()<<constrain<<endl; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain); + KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); //Only for debugging for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) @@ -280,7 +280,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const if (plugin) { kdDebug()<<"KWMailMergeDataBase::save() There is really something to save"<<endl; - TQDomElement el=doc.createElement(TQString::tqfromLatin1("PLUGIN")); + TQDomElement el=doc.createElement(TQString::fromLatin1("PLUGIN")); TQDataStream ds(plugin->info,IO_ReadOnly); TQString libname; @@ -288,7 +288,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const el.setAttribute("library",libname); parentElem.appendChild(el); kdDebug()<<"KWMailMergeDataBase::save() Calling datasource save()"<<endl; - TQDomElement el2=doc.createElement(TQString::tqfromLatin1("DATASOURCE")); + TQDomElement el2=doc.createElement(TQString::fromLatin1("DATASOURCE")); plugin->save(doc,el2); parentElem.appendChild(el2); @@ -336,18 +336,18 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList label->setBuddy( chooser ); descriptionLabel = new TQLabel( back ); descriptionLabel->hide(); - descriptionLabel->tqsetAlignment( WordBreak ); + descriptionLabel->setAlignment( WordBreak ); descriptionLabel->setFrameShape( TQFrame::Box ); descriptionLabel->setFrameShadow( TQFrame::Sunken ); - TQSize old_tqsizeHint; + TQSize old_sizeHint; for ( KTrader::OfferList::Iterator it = pluginOffers.begin(); *it; ++it ) { chooser->insertItem( (*it)->name() ); - old_tqsizeHint = descriptionLabel->tqsizeHint(); + old_sizeHint = descriptionLabel->sizeHint(); descriptionLabel->setText( (*it)->comment() ); - if (descriptionLabel->tqsizeHint().width()*descriptionLabel->tqsizeHint().height() > old_tqsizeHint.width()*old_tqsizeHint.height()) - descriptionLabel->setMinimumSize(descriptionLabel->tqsizeHint() ); + if (descriptionLabel->sizeHint().width()*descriptionLabel->sizeHint().height() > old_sizeHint.width()*old_sizeHint.height()) + descriptionLabel->setMinimumSize(descriptionLabel->sizeHint() ); } descriptionLabel->show(); @@ -395,7 +395,7 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat // row1->setSpacing( KDialog::spacingHint() ); TQLabel *l = new TQLabel( i18n( "Datasource:" ),back ); -// l->setMaximumHeight( l->tqsizeHint().height() ); +// l->setMaximumHeight( l->sizeHint().height() ); tqlayout->addWidget(l); TQHBox *row1=new TQHBox(back); @@ -410,7 +410,7 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat l = new TQLabel( i18n( "Merging:" ),back ); tqlayout->addWidget(l); -// l->setMaximumHeight( l->tqsizeHint().height() ); +// l->setMaximumHeight( l->sizeHint().height() ); TQHBox *row2=new TQHBox(back); tqlayout->addWidget(row2); row2->setSpacing( KDialog::spacingHint() ); @@ -482,7 +482,7 @@ void KWMailMergeConfigDialog::slotOpenClicked() void KWMailMergeConfigDialog::slotPreviewClicked() { db_->action=KWSLMergePreview; - KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->tqtopLevelWidget()); + KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->topLevelWidget()); if (mw) { KAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview)); @@ -520,7 +520,7 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW tqlayout->setAutoAdd( true ); TQLabel *l = new TQLabel( i18n( "Name:" ), page ); - l->setMaximumHeight( l->tqsizeHint().height() ); + l->setMaximumHeight( l->sizeHint().height() ); names = new TQListBox( page ); TQMap< TQString, TQString >::ConstIterator it = db->getRecordEntries().begin(); diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp index f3d70cb67..facb6e9d8 100644 --- a/kword/KWMailMergeLabelAction.cpp +++ b/kword/KWMailMergeLabelAction.cpp @@ -63,7 +63,7 @@ protected: { validDrag = false; } - TQSize tqsizeHint() const + TQSize sizeHint() const { int w = fontMetrics().width( text() ); int h = fontMetrics().height(); @@ -72,10 +72,10 @@ protected: void drawButton( TQPainter * p ) { // Draw the background - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), tqcolorGroup(), + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), colorGroup(), TQStyle::Style_Enabled, TQStyle::SC_ToolButton ); // Draw the label - tqstyle().tqdrawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), tqcolorGroup(), + tqstyle().drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), colorGroup(), TQStyle::Style_Enabled ); } void enterEvent( TQEvent* ) {}; diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp index 3d04fda03..2cc8443b1 100644 --- a/kword/KWPictureFrameSet.cpp +++ b/kword/KWPictureFrameSet.cpp @@ -184,7 +184,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement { TQCString data = binaryData.toElement().text().latin1(); m_picture.loadFromBase64( data ); - key = KoPictureKey("nofile", TQDateTime::tqcurrentDateTime(Qt::UTC)); + key = KoPictureKey("nofile", TQDateTime::currentDateTime(Qt::UTC)); m_picture.setKey(key); } else @@ -199,7 +199,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - key = KoPictureKey(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + key = KoPictureKey(filename, TQDateTime::currentDateTime(Qt::UTC)); m_picture.setKey(key); KoStore* store = context.store(); diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp index 3502701be..08c2ada25 100644 --- a/kword/KWResizeTableDia.cpp +++ b/kword/KWResizeTableDia.cpp @@ -43,10 +43,10 @@ KWResizeTableDia::KWResizeTableDia( TQWidget *parent, KWTableFrameSet *table, KW void KWResizeTableDia::setupTab1(int resizeColumn) { TQVBox *page = makeVBoxMainWidget(); TQLabel *rc = new TQLabel( i18n( "Column:" ), page ); - rc->resize( rc->tqsizeHint() ); - rc->tqsetAlignment( AlignLeft | AlignBottom ); + rc->resize( rc->sizeHint() ); + rc->setAlignment( AlignLeft | AlignBottom ); m_value = new TQSpinBox( 1, m_table->getColumns(), 1, page ); - m_value->resize( m_value->tqsizeHint() ); + m_value->resize( m_value->sizeHint() ); m_value->setValue( resizeColumn ); rc = new TQLabel( i18n( "Width:" ), page ); diff --git a/kword/KWSelectBookmarkDiaBase.ui b/kword/KWSelectBookmarkDiaBase.ui index 474498f4c..55da7d965 100644 --- a/kword/KWSelectBookmarkDiaBase.ui +++ b/kword/KWSelectBookmarkDiaBase.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kword/KWStartupWidgetBase.ui b/kword/KWStartupWidgetBase.ui index 57d7ce2f8..cac182d2d 100644 --- a/kword/KWStartupWidgetBase.ui +++ b/kword/KWStartupWidgetBase.ui @@ -65,7 +65,7 @@ For letters and notes with one main text, possibly on several pages, you should <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -90,7 +90,7 @@ For letters and notes with one main text, possibly on several pages, you should <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp index 47f9029b4..20016d496 100644 --- a/kword/KWTableStyle.cpp +++ b/kword/KWTableStyle.cpp @@ -31,7 +31,7 @@ #include <tqdom.h> KWTableStyleCollection::KWTableStyleCollection() - : KoUserStyleCollection( TQString::tqfromLatin1( "table" ) ) + : KoUserStyleCollection( TQString::fromLatin1( "table" ) ) { } diff --git a/kword/KWTableStyle.h b/kword/KWTableStyle.h index 0452312e0..55cfe27a0 100644 --- a/kword/KWTableStyle.h +++ b/kword/KWTableStyle.h @@ -89,7 +89,7 @@ class KWTableStyleCollection : public KoUserStyleCollection public: KWTableStyleCollection(); - static TQString defaultStyleName() { return TQString::tqfromLatin1( "Plain" ); } + static TQString defaultStyleName() { return TQString::fromLatin1( "Plain" ); } /** * Find style based on the untranslated name @p name. diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index c7cd547a2..0a9390876 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -275,20 +275,20 @@ void KWTableStyleManager::setupMain() mainLayout->setSpacing( KDialog::spacingHint() ); preview = new KWTableStylePreview( i18n("Preview"), i18n("Tablestyles preview"), main ); - preview->resize(preview->tqsizeHint()); + preview->resize(preview->sizeHint()); mainLayout->addMultiCellWidget( preview, 1, 1, 0, 1 ); m_nameString = new TQLineEdit( main ); - m_nameString->resize(m_nameString->tqsizeHint() ); + m_nameString->resize(m_nameString->sizeHint() ); connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); mainLayout->addWidget( m_nameString, 0, 1 ); TQLabel *nameLabel = new TQLabel( main ); nameLabel->setText( i18n( "Name:" ) ); - nameLabel->resize(nameLabel->tqsizeHint()); - nameLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nameLabel->resize(nameLabel->sizeHint()); + nameLabel->setAlignment( AlignRight | AlignVCenter ); mainLayout->addWidget( nameLabel, 0, 0 ); @@ -299,11 +299,11 @@ void KWTableStyleManager::setupMain() TQLabel *frameStyleLabel = new TQLabel( adjustBox ); frameStyleLabel->setText( i18n( "Framestyle:" ) ); - frameStyleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + frameStyleLabel->setAlignment( AlignRight | AlignVCenter ); TQLabel *styleLabel = new TQLabel( adjustBox ); styleLabel->setText( i18n( "Textstyle:" ) ); - styleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + styleLabel->setAlignment( AlignRight | AlignVCenter ); m_frameStyle = new TQComboBox( adjustBox ); m_style = new TQComboBox( adjustBox ); diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 43a1de5a7..7f7a78a30 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -3161,7 +3161,7 @@ void KWTextFrameSetEdit::pasteData( TQMimeSource* data, int provides, bool drop } else if ( provides & KWView::ProvidesPlainText ) { - // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" ) + // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). const TQString text = TQApplication::tqclipboard()->text(); const bool removeSelected = !drop; @@ -3188,7 +3188,7 @@ KCommand* KWTextFrameSetEdit::pasteOasisCommand( TQMimeSource* data ) TQCString returnedTypeMime = KoTextObject::providesOasis( data ); if ( !returnedTypeMime.isEmpty() ) { - TQByteArray arr = data->tqencodedData( returnedTypeMime ); + TQByteArray arr = data->encodedData( returnedTypeMime ); Q_ASSERT( !arr.isEmpty() ); if ( arr.size() ) return textFrameSet()->pasteOasis( cursor(), arr, true ); diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 4ec739eb7..d8d36c660 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -288,27 +288,27 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW if ( KStatusBar* sb = statusBar() ) // No statusbar in e.g. konqueror { m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbPageLabel, 0 ); m_sbModifiedLabel = new KStatusBarLabel( " ", 0, sb ); - m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbModifiedLabel, 0 ); m_sbFramesLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbFramesLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbFramesLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbFramesLabel, 1 ); m_sbOverwriteLabel = new KStatusBarLabel( ' ' + i18n( "INSRT" ) + ' ', 0, sb ); - m_sbOverwriteLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbOverwriteLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbOverwriteLabel, 0 ); m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_doc->zoom() ) + "% ", 0, sb ); - m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbZoomLabel, 0 ); m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_doc->unit() ) + ' ', 0, sb ); - m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbUnitLabel, 0 ); } @@ -1938,7 +1938,7 @@ void KWView::print( KPrinter &prt ) m_doc->variableCollection()->recalcVariables(VT_MAILMERGE); painter.end(); // this is what triggers the printing - m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime()); + m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime()); m_doc->recalcVariables( VT_DATE ); } @@ -2433,7 +2433,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop ) TQCString returnedTypeMime = KoTextObject::providesOasis( data ); if ( !returnedTypeMime.isEmpty() ) { - const TQByteArray arr = data->tqencodedData( returnedTypeMime ); + const TQByteArray arr = data->encodedData( returnedTypeMime ); if( !arr.isEmpty() ) { TQBuffer buffer( arr ); @@ -2836,7 +2836,7 @@ void KWView::createLinkedFrame() if (selectedFrames.count() != 1) return; // action is disabled in such a case KWFrame* frame = selectedFrames[0]->frame(); - KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->tqminimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->tqminimumSizeHint().height(), frame->width(), frame->height() ); + KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->minimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->minimumSizeHint().height(), frame->width(), frame->height() ); newFrame->setZOrder( m_doc->maxZOrder( newFrame->pageNumber(m_doc) ) + 1 ); // make sure it's on top newFrame->setCopy(true); newFrame->setNewFrameBehavior( KWFrame::Copy ); @@ -4112,7 +4112,7 @@ void KWView::insertFormula( TQMimeSource* source ) KWFormulaFrameSet *frameset = new KWFormulaFrameSet( m_doc, TQString() ); m_doc->addFrameSet( frameset, false ); // done first since the frame number is stored in the undo/redo if ( source ) { - TQByteArray data = source->tqencodedData( KFormula::MimeSource::selectionMimeType() ); + TQByteArray data = source->encodedData( KFormula::MimeSource::selectionMimeType() ); TQDomDocument formula; formula.setContent( data ); TQDomElement formulaElem = formula.namedItem("math").toElement(); @@ -5021,7 +5021,7 @@ void KWView::textSpacingDouble() void KWView::slotCounterStyleSelected() { - TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); TQString styleStr = actionName.mid(13); //kdDebug() << "KWView::slotCounterStyleSelected styleStr=" << styleStr << endl; KoParagCounter::Style style = (KoParagCounter::Style)(styleStr.toInt()); @@ -7680,8 +7680,8 @@ void KWGUI::resizeEvent( TQResizeEvent *e ) void KWGUI::reorganize() { - int hSpace = m_vertRuler->tqminimumSizeHint().width(); - int vSpace = m_horRuler->tqminimumSizeHint().height(); + int hSpace = m_vertRuler->minimumSizeHint().width(); + int vSpace = m_horRuler->minimumSizeHint().height(); if(m_view->kWordDocument()->showRuler()) { m_vertRuler->show(); diff --git a/kword/KWordViewIface.cpp b/kword/KWordViewIface.cpp index 246b92e6e..a259d9e78 100644 --- a/kword/KWordViewIface.cpp +++ b/kword/KWordViewIface.cpp @@ -394,7 +394,7 @@ bool KWordViewIface::pictureKeepRatio() const return view->getGUI()->canvasWidget()->pictureKeepRatio(); } -void KWordViewIface::changeAutoSpellChecktqStatus(bool b) +void KWordViewIface::changeAutoSpellCheckStatus(bool b) { view->autoSpellCheck(b); } diff --git a/kword/KWordViewIface.h b/kword/KWordViewIface.h index ea422ad98..5181359db 100644 --- a/kword/KWordViewIface.h +++ b/kword/KWordViewIface.h @@ -126,7 +126,7 @@ k_dcop: void setPictureKeepRatio( bool _keep); bool pictureKeepRatio() const; - void changeAutoSpellChecktqStatus(bool b); + void changeAutoSpellCheckStatus(bool b); void deselectAllFrames(); int currentPage(); void convertTableToText(); diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index 1e6c20fee..1af6b0ad1 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -115,25 +115,25 @@ void KWClassicSerialDataSource::removeRecord( int i ) void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent) { - TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); + TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION")); parent.appendChild(def); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); - defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); + TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD")); + defEnt.setAttribute(TQString::fromLatin1("name"),it.key()); def.appendChild(defEnt); } - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); - recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("name"),it.key()); + recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]); rec.appendChild(recEnt); } } @@ -148,7 +148,7 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem ) TQDomElement def=defNd.toElement(); for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement()) { - sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=i18n( "No Value" ); + sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=i18n( "No Value" ); } TQDomNode contNd=parentElem.namedItem("CONTENT"); if (contNd.isNull()) return; @@ -157,8 +157,8 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem ) appendRecord(); for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement()) { - setValue(recEnt.attribute(TQString::tqfromLatin1("name")), - recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1); + setValue(recEnt.attribute(TQString::fromLatin1("name")), + recEnt.attribute(TQString::fromLatin1("data")),db.count()-1); } } } @@ -219,9 +219,9 @@ TQString KWClassicMailMergeEditorListItem::text( int i ) const void KWClassicMailMergeEditorListItem::setup() { setHeight( TQMAX( listView()->fontMetrics().height(), - editWidget->tqsizeHint().height() ) ); - if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() ) - listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() ); + editWidget->sizeHint().height() ) ); + if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() ) + listView()->setColumnWidth( 1, editWidget->sizeHint().width() ); } void KWClassicMailMergeEditorListItem::update() @@ -342,27 +342,27 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS first = new TQToolButton( toolbar ); first->setIconSet( SmallIconSet( "start" ) ); - first->setFixedSize( first->tqsizeHint() ); + first->setFixedSize( first->sizeHint() ); connect(first, TQT_SIGNAL(clicked()), this, TQT_SLOT(firstRecord())); back_ = new TQToolButton( toolbar ); back_->setIconSet( SmallIconSet( "back" ) ); - back_->setFixedSize( back_->tqsizeHint() ); + back_->setFixedSize( back_->sizeHint() ); connect(back_, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevRecord())); records = new TQSpinBox( 1, db->getNumRecords(), 1, toolbar ); - records->setMaximumHeight( records->tqsizeHint().height() ); + records->setMaximumHeight( records->sizeHint().height() ); connect( records, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeRecord( int ) ) ); forward = new TQToolButton( toolbar ); forward->setIconSet( SmallIconSet( "forward" ) ); - forward->setFixedSize( forward->tqsizeHint() ); + forward->setFixedSize( forward->sizeHint() ); connect(forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextRecord())); finish = new TQToolButton( toolbar ); finish->setIconSet( SmallIconSet( "finish" ) ); - finish->setFixedSize( finish->tqsizeHint() ); + finish->setFixedSize( finish->sizeHint() ); connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(lastRecord())); TQWidget *sep = new TQWidget( toolbar ); @@ -370,28 +370,28 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS newRecord = new TQToolButton( toolbar ); newRecord->setIconSet( SmallIconSet( "sl_addrecord" ) ); - newRecord->setFixedSize( newRecord->tqsizeHint() ); + newRecord->setFixedSize( newRecord->sizeHint() ); connect( newRecord, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addRecord() ) ); TQToolTip::add( newRecord, i18n( "Add record" ) ); newEntry = new TQToolButton( toolbar ); newEntry->setIconSet( SmallIconSet( "sl_addentry" ) ); - newEntry->setFixedSize( newEntry->tqsizeHint() ); + newEntry->setFixedSize( newEntry->sizeHint() ); connect( newEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addEntry() ) ); TQToolTip::add( newEntry, i18n( "Add entry" ) ); deleteRecord = new TQToolButton( toolbar ); deleteRecord->setIconSet( SmallIconSet( "sl_delrecord" ) ); - deleteRecord->setFixedSize( deleteRecord->tqsizeHint() ); + deleteRecord->setFixedSize( deleteRecord->sizeHint() ); connect( deleteRecord, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeRecord() ) ); TQToolTip::add( deleteRecord, i18n( "Remove record" ) ); deleteEntry = new TQToolButton( toolbar ); deleteEntry->setIconSet( SmallIconSet( "sl_delentry" ) ); - deleteEntry->setFixedSize( deleteEntry->tqsizeHint() ); + deleteEntry->setFixedSize( deleteEntry->sizeHint() ); connect( deleteEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeEntry() ) ); TQToolTip::add( deleteEntry, i18n( "Remove entry" ) ); diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 411ee5e57..7b8feb704 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -409,7 +409,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem ) for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); recEnt=recEnt.nextSibling().toElement() ) { - addEntry( recEnt.attribute( TQString::tqfromLatin1("uid") ) ); + addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) ); } } else if( rec.nodeName() == "LIST" ) @@ -417,7 +417,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem ) for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); recEnt=recEnt.nextSibling().toElement() ) { - addList( recEnt.attribute( TQString::tqfromLatin1("listid") ) ); + addList( recEnt.attribute( TQString::fromLatin1("listid") ) ); } } else @@ -482,26 +482,26 @@ void KWMailMergeKABC::refresh( bool ) void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent) { - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); TQValueList<TQString>::ConstIterator it = _individualUIDs.begin(); for( ; it != _individualUIDs.end(); ++it ) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("uid"),*it); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("uid"),*it); rec.appendChild(recEnt); } it = _lists.begin(); for( ; !(it == _lists.end()); ++it ) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("LIST")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST")); cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("listid"),*it); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("listid"),*it); rec.appendChild(recEnt); } } diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui index c7276c9b4..e9d389ad4 100644 --- a/kword/mailmerge/kabc/addresspicker.ui +++ b/kword/mailmerge/kabc/addresspicker.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index 6801a64a0..1a4777374 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -66,15 +66,15 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem ) if ( element.isNull() ) return; - _url = element.attribute( TQString::tqfromLatin1( "URL" ) ); - _spreadSheetNumber = element.attribute( TQString::tqfromLatin1( "SpreadSheetNumber" ) ).toInt(); + _url = element.attribute( TQString::fromLatin1( "URL" ) ); + _spreadSheetNumber = element.attribute( TQString::fromLatin1( "SpreadSheetNumber" ) ).toInt(); initDocument(); } void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent ) { - TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) ); + TQDomElement content = doc.createElement( TQString::fromLatin1( "CONTENT" ) ); parent.appendChild( content ); content.setAttribute( "URL", _url.url() ); diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index 3db1d9d6f..c45d75275 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -33,7 +33,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent) int h=m_table->rowHeight(0); for (int i=0;i<6;i++) h+=m_table->rowHeight(i); - h+=m_table->horizontalHeader()->tqsizeHint().height(); + h+=m_table->horizontalHeader()->sizeHint().height(); m_table->setMinimumHeight(h); int w=0; diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index 544f79904..d5e9b4ac7 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -85,27 +85,27 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent) { - TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); + TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION")); parent.appendChild(def); { - TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("DATABASE")); - defEnt.setAttribute(TQString::tqfromLatin1("hostname"),hostname); - defEnt.setAttribute(TQString::tqfromLatin1("port"),port); - defEnt.setAttribute(TQString::tqfromLatin1("driver"),driver); - defEnt.setAttribute(TQString::tqfromLatin1("databasename"),databasename); - defEnt.setAttribute(TQString::tqfromLatin1("username"),username); + TQDomElement defEnt=doc.createElement(TQString::fromLatin1("DATABASE")); + defEnt.setAttribute(TQString::fromLatin1("hostname"),hostname); + defEnt.setAttribute(TQString::fromLatin1("port"),port); + defEnt.setAttribute(TQString::fromLatin1("driver"),driver); + defEnt.setAttribute(TQString::fromLatin1("databasename"),databasename); + defEnt.setAttribute(TQString::fromLatin1("username"),username); def.appendChild(defEnt); - defEnt=doc.createElement(TQString::tqfromLatin1("QUERY")); - defEnt.setAttribute(TQString::tqfromLatin1("value"),query); + defEnt=doc.createElement(TQString::fromLatin1("QUERY")); + defEnt.setAttribute(TQString::fromLatin1("value"),query); def.appendChild(defEnt); - TQDomElement sampleEnt=doc.createElement(TQString::tqfromLatin1("SAMPLERECORD")); + TQDomElement sampleEnt=doc.createElement(TQString::fromLatin1("SAMPLERECORD")); parent.appendChild(sampleEnt); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement fieldEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); - fieldEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); + TQDomElement fieldEnt=doc.createElement(TQString::fromLatin1("FIELD")); + fieldEnt.setAttribute(TQString::fromLatin1("name"),it.key()); sampleEnt.appendChild(fieldEnt); } } @@ -122,19 +122,19 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem ) if (!dbNd.isNull()) { TQDomElement dbEnt=dbNd.toElement(); - if (dbEnt.tagName()==TQString::tqfromLatin1("DATABASE")) + if (dbEnt.tagName()==TQString::fromLatin1("DATABASE")) { - hostname=dbEnt.attribute(TQString::tqfromLatin1("hostname")); - port=dbEnt.attribute(TQString::tqfromLatin1("port")); - driver=dbEnt.attribute(TQString::tqfromLatin1("driver")); - databasename=dbEnt.attribute(TQString::tqfromLatin1("databasename")); - username=dbEnt.attribute(TQString::tqfromLatin1("username")); + hostname=dbEnt.attribute(TQString::fromLatin1("hostname")); + port=dbEnt.attribute(TQString::fromLatin1("port")); + driver=dbEnt.attribute(TQString::fromLatin1("driver")); + databasename=dbEnt.attribute(TQString::fromLatin1("databasename")); + username=dbEnt.attribute(TQString::fromLatin1("username")); } } TQDomNode queryNd=def.namedItem("QUERY"); if (!queryNd.isNull()) { - query=queryNd.toElement().attribute(TQString::tqfromLatin1("value")); + query=queryNd.toElement().attribute(TQString::fromLatin1("value")); } } @@ -144,7 +144,7 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem ) TQDomElement def1=defNd.toElement(); for (TQDomElement defEnt=defNd.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement()) { - addSampleRecordEntry(defEnt.attribute(TQString::tqfromLatin1("name"))); + addSampleRecordEntry(defEnt.attribute(TQString::fromLatin1("name"))); } } } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index ec31df358..2181c172e 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -66,25 +66,25 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*parent*/) { /* - TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); + TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION")); parent.appendChild(def); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); - defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); + TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD")); + defEnt.setAttribute(TQString::fromLatin1("name"),it.key()); def.appendChild(defEnt); } - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); - recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("name"),it.key()); + recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]); rec.appendChild(recEnt); } } @@ -101,7 +101,7 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ ) TQDomElement def=defNd.toElement(); for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement()) { - sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=defEnt.attribute(TQString::tqfromLatin1("name"));//i18n( "No Value" ); + sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=defEnt.attribute(TQString::fromLatin1("name"));//i18n( "No Value" ); } TQDomNode contNd=parentElem.namedItem("CONTENT"); if (contNd.isNull()) return; @@ -110,8 +110,8 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ ) appendRecord(); for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement()) { - setValue(recEnt.attribute(TQString::tqfromLatin1("name")), - recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1); + setValue(recEnt.attribute(TQString::fromLatin1("name")), + recEnt.attribute(TQString::fromLatin1("data")),db.count()-1); } } */ diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui index a68b62dbd..afff8c7ff 100644 --- a/kword/mailmerge/sql/kwqtsqlpower.ui +++ b/kword/mailmerge/sql/kwqtsqlpower.ui @@ -54,7 +54,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>120</height> @@ -73,7 +73,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>120</height> @@ -168,7 +168,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -196,7 +196,7 @@ <property name="name"> <cstring>Line2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/kword/mailmerge/sql/qtsqlopenwidget.ui b/kword/mailmerge/sql/qtsqlopenwidget.ui index fc32bded0..c0d2423ad 100644 --- a/kword/mailmerge/sql/qtsqlopenwidget.ui +++ b/kword/mailmerge/sql/qtsqlopenwidget.ui @@ -283,7 +283,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc index 774c7e79e..f533db862 100644 --- a/lib/kformula/kformulacontainer.cc +++ b/lib/kformula/kformulacontainer.cc @@ -342,7 +342,7 @@ void Container::paste() TQClipboard* clipboard = TQApplication::tqclipboard(); const TQMimeSource* source = clipboard->data(); if (source->provides( MimeSource::selectionMimeType() )) { - TQByteArray data = source->tqencodedData( MimeSource::selectionMimeType() ); + TQByteArray data = source->encodedData( MimeSource::selectionMimeType() ); TQDomDocument formula; formula.setContent(data); paste( formula, i18n("Paste") ); diff --git a/lib/kformula/kformulamimesource.cc b/lib/kformula/kformulamimesource.cc index 58a6ad351..4c7df0c77 100644 --- a/lib/kformula/kformulamimesource.cc +++ b/lib/kformula/kformulamimesource.cc @@ -99,7 +99,7 @@ bool MimeSource::provides( const char * format) const return false; } -TQByteArray MimeSource::tqencodedData ( const char *format ) const +TQByteArray MimeSource::encodedData ( const char *format ) const { TQString fmt=format; //case sensitive? diff --git a/lib/kformula/kformulamimesource.h b/lib/kformula/kformulamimesource.h index a58255eb8..3a94eaef4 100644 --- a/lib/kformula/kformulamimesource.h +++ b/lib/kformula/kformulamimesource.h @@ -39,7 +39,7 @@ public: virtual const char* format ( int n = 0 ) const; virtual bool provides ( const char * ) const; - virtual TQByteArray tqencodedData ( const char * ) const; + virtual TQByteArray encodedData ( const char * ) const; virtual const SymbolTable& getSymbolTable() const; diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc index ef5e09a35..0a3399eb2 100644 --- a/lib/kformula/kformulawidget.cc +++ b/lib/kformula/kformulawidget.cc @@ -73,7 +73,7 @@ void KFormulaWidget::paintEvent(TQPaintEvent* event) // than it seems to be as each cursor movement requires a tqrepaint. TQPainter p( &buffer ); //p.translate( -fr.x(), -fr.y() ); - formulaView.draw( p, event->rect(), tqcolorGroup() ); + formulaView.draw( p, event->rect(), colorGroup() ); TQPainter painter; painter.begin(this); diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index d5aa31766..aca4dc038 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -128,7 +128,7 @@ int SymbolAction::plug( TQWidget* w, int index ) TQT_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); @@ -166,7 +166,7 @@ void SymbolAction::updateItems( int id ) for( uint i = 0; i < items().count(); ++i ) { new SymbolComboItem( *items().at( i ), m_font, m_chars.at( i ), cb ); } - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); } } } diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp index 41dfee8f2..e7752347c 100644 --- a/lib/kofficecore/KoChild.cpp +++ b/lib/kofficecore/KoChild.cpp @@ -123,9 +123,9 @@ void KoChild::setClipRegion( TQPainter &painter, bool combine ) { painter.setClipping( true ); if ( combine && !painter.clipRegion().isEmpty() ) - painter.setClipRegion( region( painter.tqworldMatrix() ).intersect( painter.clipRegion() ) ); + painter.setClipRegion( region( painter.worldMatrix() ).intersect( painter.clipRegion() ) ); else - painter.setClipRegion( region( painter.tqworldMatrix() ) ); + painter.setClipRegion( region( painter.worldMatrix() ) ); } void KoChild::setScaling( double x, double y ) @@ -218,7 +218,7 @@ void KoChild::transform( TQPainter &painter ) { setClipRegion( painter, true ); - TQWMatrix m = painter.tqworldMatrix(); + TQWMatrix m = painter.worldMatrix(); m = d->m_matrix * m; m.scale( d->m_scaleX, d->m_scaleY ); painter.setWorldMatrix( m ); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index ba3c9d547..ddfce1839 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -401,7 +401,7 @@ bool KoDocument::saveFile() backup = url(); else backup = d->m_backupPath +"/"+url().fileName(); - backup.setPath( backup.path() + TQString::tqfromLatin1("~") ); + backup.setPath( backup.path() + TQString::fromLatin1("~") ); KFileItem item( entry, url() ); Q_ASSERT( item.name() == url().fileName() ); KIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() ); @@ -418,7 +418,7 @@ bool KoDocument::saveFile() if ( !d->filterManager ) d->filterManager = new KoFilterManager( this ); - KoFilter::ConversiontqStatus status = d->filterManager->exp0rt( m_file, outputMimeType ); + KoFilter::ConversionStatus status = d->filterManager->exp0rt( m_file, outputMimeType ); ret = status == KoFilter::OK; suppressErrorDialog = (status == KoFilter::UserCancelled || status == KoFilter::BadConversionGraph ); } else { @@ -1274,7 +1274,7 @@ TQString KoDocument::autoSaveFile( const TQString & path ) const // Never saved? Use a temp file in $HOME then // Yes, two open unnamed docs will overwrite each other's autosave file, // but hmm, we can only do something if that's in the same process anyway... - TQString ret = TQDir::homeDirPath() + "/." + TQString::tqfromLatin1(instance()->instanceName()) + ".autosave" + extension; + TQString ret = TQDir::homeDirPath() + "/." + TQString::fromLatin1(instance()->instanceName()) + ".autosave" + extension; return ret; } else @@ -1456,7 +1456,7 @@ bool KoDocument::openFile() if ( !isNativeFormat( typeName.latin1() ) ) { if ( !d->filterManager ) d->filterManager = new KoFilterManager( this ); - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; importedFile = d->filterManager->import( m_file, status ); if ( status != KoFilter::OK ) { @@ -2082,7 +2082,7 @@ void KoDocument::setTitleModified() // Get caption from document info (title(), in about page) if ( documentInfo() ) { - KoDocumentInfoPage * page = documentInfo()->page( TQString::tqfromLatin1("about") ); + KoDocumentInfoPage * page = documentInfo()->page( TQString::fromLatin1("about") ); if (page) caption = static_cast<KoDocumentInfoAbout *>(page)->title(); } @@ -2233,7 +2233,7 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance ) // Try by path first, so that we find the global one (which has the native mimetype) // even if the user created a kword.desktop in ~/.kde/share/applnk or any subdir of it. // If he created it under ~/.kde/share/applnk/Office/ then no problem anyway. - service = KService::serviceByDesktopPath( TQString::tqfromLatin1("Office/%1.desktop").tqarg(instname) ); + service = KService::serviceByDesktopPath( TQString::fromLatin1("Office/%1.desktop").tqarg(instname) ); } if ( !service ) service = KService::serviceByDesktopName( instname ); diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index cd4ecbafb..0b54ebbbd 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -629,7 +629,7 @@ KoDocumentInfoAbout::KoDocumentInfoAbout( KoDocumentInfo* info ) m_docInfo = info; m_editingCycles = 0; m_initialCreator = m_docInfo->creator(); - m_creationDate = TQDateTime::tqcurrentDateTime(); + m_creationDate = TQDateTime::currentDateTime(); } void KoDocumentInfoAbout::saveParameters() @@ -637,7 +637,7 @@ void KoDocumentInfoAbout::saveParameters() KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->parent() ); if ( m_firstSave && doc && !doc->isAutosaving() ) m_editingCycles++; - m_modificationDate = TQDateTime::tqcurrentDateTime(); + m_modificationDate = TQDateTime::currentDateTime(); m_firstSave = false; } @@ -878,7 +878,7 @@ void KoDocumentInfoAbout::resetMetaData() { m_editingCycles = 0; m_initialCreator = m_docInfo->creator(); - m_creationDate = TQDateTime::tqcurrentDateTime(); + m_creationDate = TQDateTime::currentDateTime(); m_modificationDate = TQDateTime(); } diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 5973dbb47..8fd35ea9c 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -191,7 +191,7 @@ void KoDocumentInfoDlg::deleteInfo() void KoDocumentInfoDlg::resetMetaData() { - TQString s = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ); + TQString s = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ); d->m_aboutWidget->labelCreated->setText( s + ", " + d->m_info->creator() ); d->m_aboutWidget->labelModified->setText( "" ); d->m_aboutWidget->labelRevision->setText( "0" ); diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp index 628d5f17a..e4284e574 100644 --- a/lib/kofficecore/KoFilter.cpp +++ b/lib/kofficecore/KoFilter.cpp @@ -65,7 +65,7 @@ KoEmbeddingFilter::KoEmbeddingFilter() : KoFilter() } int KoEmbeddingFilter::embedPart( const TQCString& from, TQCString& to, - KoFilter::ConversiontqStatus& status, const TQString& key ) + KoFilter::ConversionStatus& status, const TQString& key ) { ++( m_partStack.top()->m_lruPartIndex ); diff --git a/lib/kofficecore/KoFilter.h b/lib/kofficecore/KoFilter.h index 77439648e..dc8c29476 100644 --- a/lib/kofficecore/KoFilter.h +++ b/lib/kofficecore/KoFilter.h @@ -61,7 +61,7 @@ public: * Feel free to add some more error conditions @em before the last item * if it's needed. */ - enum ConversiontqStatus { OK, StupidError, UsageError, CreationError, FileNotFound, + enum ConversionStatus { OK, StupidError, UsageError, CreationError, FileNotFound, StorageCreationError, BadMimeType, BadConversionGraph, EmbeddedDocError, WrongFormat, NotImplemented, ParsingError, InternalError, UnexpectedEOF, @@ -79,10 +79,10 @@ public: * * @param from The mimetype of the source file/document * @param to The mimetype of the destination file/document - * @return The error status, see the @ref #ConversiontqStatus enum. + * @return The error status, see the @ref #ConversionStatus enum. * KoFilter::OK means that everything is alright. */ - virtual ConversiontqStatus convert( const TQCString& from, const TQCString& to ) = 0; + virtual ConversionStatus convert( const TQCString& from, const TQCString& to ) = 0; signals: /** @@ -201,7 +201,7 @@ protected: * within the embedding filter). */ int embedPart( const TQCString& from, TQCString& to, - KoFilter::ConversiontqStatus& status, + KoFilter::ConversionStatus& status, const TQString& key = TQString() ); /** diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index 471d60988..37ff5d95f 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -46,7 +46,7 @@ KoFilterChain::ChainLink::ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr fi { } -KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink ) +KoFilter::ConversionStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink ) { if ( !m_filterEntry ) { kdError( 30500 ) << "This filter entry is null. Strange stuff going on." << endl; @@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const Chain if ( parentChainLink ) setupCommunication( parentChainLink->m_filter ); - KoFilter::ConversiontqStatus status = m_filter->convert( m_from, m_to ); + KoFilter::ConversionStatus status = m_filter->convert( m_from, m_to ); delete m_filter; m_filter=0; return status; @@ -90,8 +90,8 @@ void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentF if ( !parentFilter ) return; - const TQMetaObject* const parent = parentFilter->tqmetaObject(); - const TQMetaObject* const child = m_filter->tqmetaObject(); + const TQMetaObject* const parent = parentFilter->metaObject(); + const TQMetaObject* const child = m_filter->metaObject(); if ( !parent || !child ) return; @@ -131,9 +131,9 @@ KoFilterChain::~KoFilterChain() manageIO(); // Called for the 2nd time in a row -> clean up } -KoFilter::ConversiontqStatus KoFilterChain::invokeChain() +KoFilter::ConversionStatus KoFilterChain::invokeChain() { - KoFilter::ConversiontqStatus status = KoFilter::OK; + KoFilter::ConversionStatus status = KoFilter::OK; m_state = Beginning; int count = m_chainLinks.count(); diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h index d926c613f..a044eebe2 100644 --- a/lib/kofficecore/KoFilterChain.h +++ b/lib/kofficecore/KoFilterChain.h @@ -69,7 +69,7 @@ public: * @return The return status of the conversion. KoFilter::OK * if everything is alright. */ - KoFilter::ConversiontqStatus invokeChain(); + KoFilter::ConversionStatus invokeChain(); /** * Tells the @ref KoFilterManager the output file of the @@ -182,7 +182,7 @@ private: ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr filterEntry, const TQCString& from, const TQCString& to ); - KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const parentChainLink ); + KoFilter::ConversionStatus invokeFilter( const ChainLink* const parentChainLink ); TQCString from() const { return m_from; } TQCString to() const { return m_to; } diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index 31a1e43ea..e7ee131c4 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -138,7 +138,7 @@ KoFilterManager::~KoFilterManager() delete d; } -TQString KoFilterManager::import( const TQString& url, KoFilter::ConversiontqStatus& status ) +TQString KoFilterManager::import( const TQString& url, KoFilter::ConversionStatus& status ) { // Find the mime type for the file to be imported. KURL u; @@ -231,7 +231,7 @@ TQString KoFilterManager::import( const TQString& url, KoFilter::ConversiontqSta return TQString(); } -KoFilter::ConversiontqStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType ) +KoFilter::ConversionStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType ) { bool userCancelled = false; @@ -482,7 +482,7 @@ TQStringList KoFilterManager::mimeFilter( const TQCString& mimetype, Direction d // TODO maybe use the fake vertex trick from the method below, to make the search faster? TQStringList nativeMimeTypes; - nativeMimeTypes.append( TQString::tqfromLatin1( mimetype ) ); + nativeMimeTypes.append( TQString::fromLatin1( mimetype ) ); nativeMimeTypes += extraNativeMimeTypes; // Add the native mimetypes first so that they are on top. diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h index 5f0641f4f..111580126 100644 --- a/lib/kofficecore/KoFilterManager.h +++ b/lib/kofficecore/KoFilterManager.h @@ -81,7 +81,7 @@ public: * If the TQString which is returned isEmpty() and the status is OK, * then we imported the file directly into the document. */ - TQString import( const TQString& url, KoFilter::ConversiontqStatus& status ); + TQString import( const TQString& url, KoFilter::ConversionStatus& status ); /** * @brief Exports the given file/document to the specified URL/mimetype. * @@ -89,7 +89,7 @@ public: * and when the method returns @p mimeType contains this mimetype. * Oh, well, export is a C++ keyword ;) */ - KoFilter::ConversiontqStatus exp0rt( const TQString& url, TQCString& mimeType ); + KoFilter::ConversionStatus exp0rt( const TQString& url, TQCString& mimeType ); diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp index 5c8f680f3..e140ac50f 100644 --- a/lib/kofficecore/KoGenStyles.cpp +++ b/lib/kofficecore/KoGenStyles.cpp @@ -225,7 +225,7 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha } if ( !m_familyName.isEmpty() ) const_cast<KoGenStyle *>( this )-> - addAttribute( "style:family", TQString::tqfromLatin1( m_familyName ) ); + addAttribute( "style:family", TQString::fromLatin1( m_familyName ) ); else { if ( qstrcmp( elementName, "style:style" ) == 0 ) kdWarning(30003) << "User style " << name << " is without family - invalid. m_type=" << m_type << endl; diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp index 8ba1c0777..3c979f934 100644 --- a/lib/kofficecore/KoGlobal.cpp +++ b/lib/kofficecore/KoGlobal.cpp @@ -136,7 +136,7 @@ void KoGlobal::createListOfLanguages() // currently have en_GB or en_US etc. const TQStringList translationList = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); for ( TQStringList::ConstIterator it = translationList.begin(); it != translationList.end(); ++it ) { diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 1219bf093..4428d5245 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -499,7 +499,7 @@ void KoMainWindow::updateCaption() // Get caption from document info (title(), in about page) if ( rootDocument()->documentInfo() ) { - KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::tqfromLatin1("about") ); + KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::fromLatin1("about") ); if (page) caption = static_cast<KoDocumentInfoAbout *>(page)->title(); } @@ -1212,7 +1212,7 @@ void KoMainWindow::print(bool quick) { if ( title.isEmpty() ) { // #139905 - breaks message freeze though //const TQString programName = instance()->aboutData() ? instance()->aboutData()->programName() : instance()->instanceName(); - //title = i18n("%1 unsaved document (%2)").tqarg(programName).tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true/*short*/)); + //title = i18n("%1 unsaved document (%2)").tqarg(programName).tqarg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/)); } printer.setDocName( title ); printer.setDocFileName( fileName ); diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp index 05eff10ba..d01ca6db3 100644 --- a/lib/kofficecore/KoPageLayout.cpp +++ b/lib/kofficecore/KoPageLayout.cpp @@ -198,15 +198,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height ) TQString KoPageFormat::formatString( KoFormat format ) { if ( format <= PG_LAST_FORMAT ) - return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName ); - return TQString::tqfromLatin1( "A4" ); + return TQString::fromLatin1( pageFormatInfo[ format ].shortName ); + return TQString::fromLatin1( "A4" ); } KoFormat KoPageFormat::formatFromString( const TQString & string ) { for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i ) { - if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName )) + if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName )) return pageFormatInfo[ i ].format; } // We do not know the format name, so we have a custom format diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp index 9edbc981a..236b08d78 100644 --- a/lib/kofficecore/KoPictureEps.cpp +++ b/lib/kofficecore/KoPictureEps.cpp @@ -399,7 +399,7 @@ bool KoPictureEps::loadData(const TQByteArray& array, const TQString& /* extensi kdError(30003) << "Not standard bounding box: " << line << endl; return false; } - kdDebug(30003) << "Reg. Exp. Found: " << exp.tqcapturedTexts() << endl; + kdDebug(30003) << "Reg. Exp. Found: " << exp.capturedTexts() << endl; rect.setLeft((int)exp.cap(1).toDouble()); rect.setTop((int)exp.cap(2).toDouble()); rect.setRight((int)exp.cap(3).toDouble()); diff --git a/lib/kofficecore/KoPictureKey.cpp b/lib/kofficecore/KoPictureKey.cpp index 0badb429e..32d733365 100644 --- a/lib/kofficecore/KoPictureKey.cpp +++ b/lib/kofficecore/KoPictureKey.cpp @@ -139,7 +139,7 @@ void KoPictureKey::loadAttributes( const TQDomElement &elem ) TQString KoPictureKey::toString() const { // We do not use the default TQDateTime::toString has it does not show microseconds - return TQString::tqfromLatin1( "%1 %2" ) + return TQString::fromLatin1( "%1 %2" ) .tqarg( m_filename, m_lastModified.toString("yyyy-MM-dd hh:mm:ss.zzz") ); } diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp index 0003d00d1..cc9ab9203 100644 --- a/lib/kofficecore/KoQueryTrader.cpp +++ b/lib/kofficecore/KoQueryTrader.cpp @@ -76,14 +76,14 @@ KoDocument* KoDocumentEntry::createDoc( KoDocument* parent, const char* name ) c KoDocumentEntry KoDocumentEntry::queryByMimeType( const TQString & mimetype ) { - TQString constr = TQString::tqfromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).tqarg( mimetype ).tqarg( mimetype ); + TQString constr = TQString::fromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).tqarg( mimetype ).tqarg( mimetype ); TQValueList<KoDocumentEntry> vec = query( false,constr ); if ( vec.isEmpty() ) { kdWarning(30003) << "Got no results with " << constr << endl; // Fallback to the old way (which was probably wrong, but better be safe) - TQString constr = TQString::tqfromLatin1( "'%1' in ServiceTypes" ).tqarg( mimetype ); + TQString constr = TQString::fromLatin1( "'%1' in ServiceTypes" ).tqarg( mimetype ); vec = query( constr ); if ( vec.isEmpty() ) { diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index 75c8fec8c..4728c7a82 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -136,7 +136,7 @@ void KoSpeaker::probe() TQPoint pos; bool spoke = false; if ( d->m_speakFlags & SpeakFocusWidget ) { - w = kapp->tqfocusWidget(); + w = kapp->focusWidget(); if (w) { spoke = maybeSayWidget(w); if (!spoke) diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp index cc8823457..3ba89f24b 100644 --- a/lib/kofficecore/KoUnit.cpp +++ b/lib/kofficecore/KoUnit.cpp @@ -183,15 +183,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) { if ( ok ) *ok = true; - if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM; - if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM; - if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM; - if ( _unitName == TQString::tqfromLatin1( "in" ) - || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH; - if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI; - if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD; - if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC; - if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT; + if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM; + if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM; + if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM; + if ( _unitName == TQString::fromLatin1( "in" ) + || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH; + if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI; + if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD; + if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC; + if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT; if ( ok ) *ok = false; return U_PT; @@ -199,14 +199,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) TQString KoUnit::unitName( Unit _unit ) { - if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" ); - if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" ); - if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" ); - if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" ); - if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" ); - if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" ); - if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" ); - return TQString::tqfromLatin1( "pt" ); + if ( _unit == U_MM ) return TQString::fromLatin1( "mm" ); + if ( _unit == U_CM ) return TQString::fromLatin1( "cm" ); + if ( _unit == U_DM ) return TQString::fromLatin1( "dm" ); + if ( _unit == U_INCH ) return TQString::fromLatin1( "in" ); + if ( _unit == U_PI ) return TQString::fromLatin1( "pi" ); + if ( _unit == U_DD ) return TQString::fromLatin1( "dd" ); + if ( _unit == U_CC ) return TQString::fromLatin1( "cc" ); + return TQString::fromLatin1( "pt" ); } void KoUnit::saveOasis(KoXmlWriter* settingsWriter, Unit _unit) diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index debb9f7c0..7dc1f0b03 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -671,12 +671,12 @@ void KoView::endOperation() KoMainWindow * KoView::shell() const { - return dynamic_cast<KoMainWindow *>( tqtopLevelWidget() ); + return dynamic_cast<KoMainWindow *>( topLevelWidget() ); } KMainWindow * KoView::mainWindow() const { - return dynamic_cast<KMainWindow *>( tqtopLevelWidget() ); + return dynamic_cast<KMainWindow *>( topLevelWidget() ); } KStatusBar * KoView::statusBar() const diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index 9535c14ac..763bd792a 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -274,7 +274,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e ) TQWidgetList* KKbdAccessExtensions::getAllPanels() { - TQWidgetList* allWidgets = kapp->tqallWidgets(); + TQWidgetList* allWidgets = kapp->allWidgets(); TQWidgetList* allPanels = new TQWidgetList; TQWidget* widget = allWidgets->first(); while (widget) { @@ -390,7 +390,7 @@ void KKbdAccessExtensions::showIcon() { if (!d->panel) return; TQPoint p; - // kdDebug() << "KKbdAccessExtensions::showIcon: tqtopLevelWidget = " << d->panel->tqtopLevelWidget()->name() << endl; + // kdDebug() << "KKbdAccessExtensions::showIcon: topLevelWidget = " << d->panel->topLevelWidget()->name() << endl; if (::tqqt_cast<TQSplitter*>( d->panel )) { TQSplitter* splitter = dynamic_cast<TQSplitter *>(d->panel); int handleNdx = d->handleNdx - 1; @@ -413,8 +413,8 @@ void KKbdAccessExtensions::showIcon() p = dockWindow->pos(); if (dockWindow->area()) { // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->parentWidget()->name() << endl; - p = dockWindow->parentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p); - // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->tqtopLevelWidget()->name() << endl; + p = dockWindow->parentWidget()->mapTo(dockWindow->topLevelWidget(), p); + // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->topLevelWidget()->name() << endl; // TODO: How to get the handle width? if (d->handleNdx == 1) { d->icon->setShape(TQt::SizeHorCursor); @@ -440,7 +440,7 @@ void KKbdAccessExtensions::showIcon() // else Handle is above the dock window. } } - p = dockWindow->tqtopLevelWidget()->mapToGlobal(p); + p = dockWindow->topLevelWidget()->mapToGlobal(p); } else { d->icon->setShape(TQt::SizeAllCursor); p = TQPoint(dockWindow->width() / 2, dockWindow->height() / 2); @@ -571,7 +571,7 @@ void KKbdAccessExtensions::displayAccessKeys() } // Find all visible, focusable widgets and create a TQLabel for each. Don't exceed // available list of access keys. - TQWidgetList* allWidgets = kapp->tqallWidgets(); + TQWidgetList* allWidgets = kapp->allWidgets(); TQWidget* widget = allWidgets->first(); int accessCount = 0; int maxAccessCount = availableAccessKeys.length(); diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui index c29e4a468..2dc1c6f48 100644 --- a/lib/kofficecore/koDetailsPaneBase.ui +++ b/lib/kofficecore/koDetailsPaneBase.ui @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui index cf65eb81e..bfd4d49e2 100644 --- a/lib/kofficecore/koDocumentInfoAboutWidget.ui +++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui @@ -31,7 +31,7 @@ <property name="name"> <cstring>pixmapLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>56</width> <height>56</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>70</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -277,13 +277,13 @@ <property name="name"> <cstring>pbReset</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>24</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>16</height> diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui index 60353b915..e007e1a2f 100644 --- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui +++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui @@ -31,7 +31,7 @@ <property name="name"> <cstring>labelAuthor</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>56</width> <height>56</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui index 2a8a531e8..d97a33f26 100644 --- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui +++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui @@ -36,7 +36,7 @@ <property name="name"> <cstring>kPushButton2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>130</width> <height>0</height> @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp index c8b104a95..4095ae092 100644 --- a/lib/kofficeui/KoCharSelectDia.cpp +++ b/lib/kofficeui/KoCharSelectDia.cpp @@ -58,7 +58,7 @@ void KoCharSelectDia::initDialog(const TQChar &_chr, const TQString &_font, bool charSelect = new KCharSelect( page, "", _font, _chr ); connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); - charSelect->resize( charSelect->tqsizeHint() ); + charSelect->resize( charSelect->sizeHint() ); charSelect->enableFontCombo( true ); grid->addWidget( charSelect, 0, 0 ); diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 27c51e792..9f071db98 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -53,7 +53,7 @@ void KoListBox::contentsMouseMoveEvent ( TQMouseEvent * e) } } -TQSize KoListBox::tqsizeHint() const +TQSize KoListBox::sizeHint() const { return TQSize(TQMIN(maxItemWidth() + verticalScrollBar()->width() + 4, 400), TQMIN(count() * itemHeight() + horizontalScrollBar()->height() + 4,300)); diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h index 8522da3b9..89b83744b 100644 --- a/lib/kofficeui/KoCommandHistory.h +++ b/lib/kofficeui/KoCommandHistory.h @@ -39,7 +39,7 @@ public: KoListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); protected: virtual void contentsMouseMoveEvent ( TQMouseEvent * ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: void changeNumberOfSelectedItem( int ); }; diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 82f786e87..2b1a2cbec 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -61,7 +61,7 @@ void KoVerticalLabel::paintEvent( TQPaintEvent* ) KPixmap pm; pm.resize( height(), width() ); TQPainter p( &pm ); - p.fillRect( 0, 0, height(), width(), tqcolorGroup().background() ); + p.fillRect( 0, 0, height(), width(), colorGroup().background() ); p.setFont( font() ); p.drawText( 0, 0, height(), width(), AlignCenter, m_text ); p.end(); @@ -90,9 +90,9 @@ void KoHelpNavButton::paintEvent( TQPaintEvent* ) if ( isEnabled() ) { if ( m_pressed ) - p.setPen( tqcolorGroup().highlight() ); + p.setPen( colorGroup().highlight() ); else - p.setPen( tqcolorGroup().text() ); + p.setPen( colorGroup().text() ); p.drawPixmap( 1, 1, m_bitmap ); } } // KoHelpNavButton::paintEvent @@ -142,9 +142,9 @@ void KoTinyButton::paintEvent( TQPaintEvent* ) if ( isEnabled() ) { if ( m_pressed ) - p.setPen( tqcolorGroup().highlight() ); + p.setPen( colorGroup().highlight() ); else - p.setPen( tqcolorGroup().text() ); + p.setPen( colorGroup().text() ); p.drawPixmap( width() / 2 - 2, 1, m_bitmap ); } } // KoTinyButton::paintEvent @@ -265,7 +265,7 @@ bool KoHelpView::eventFilter( TQObject*, TQEvent* e ) void KoHelpView::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - currentText->draw( &p, 0, 0, TQRect(), tqcolorGroup() ); + currentText->draw( &p, 0, 0, TQRect(), colorGroup() ); } // KoHelpView::paintEvent KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent ) @@ -450,7 +450,7 @@ void KoContextHelpPopup::resizeEvent( TQResizeEvent* ) void KoContextHelpPopup::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - p.fillRect( 0, 0, width(), height(), tqcolorGroup().light() ); + p.fillRect( 0, 0, width(), height(), colorGroup().light() ); p.setPen( black ); p.drawRect( 0, 0, width(), height() ); p.fillRect( width() - 3, 0, width() - 1, height() - 1, black ); diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index 19fd8c924..51afb24bb 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -75,7 +75,7 @@ KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, cons TQVBox *page =makeVBoxMainWidget(); new TQLabel( i18n("Location:"), page); m_urlReq = new KURLRequester(page); - m_urlReq->setMinimumWidth( m_urlReq->tqsizeHint().width() * 3 ); + m_urlReq->setMinimumWidth( m_urlReq->sizeHint().width() * 3 ); m_urlReq->lineEdit()->setText( _path ); m_urlReq->fileDialog()->setMode(KFile::Directory | KFile::LocalOnly); diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui index 688688c2b..5d3d6e4fb 100644 --- a/lib/kofficeui/KoGeneralPropertyUi.ui +++ b/lib/kofficeui/KoGeneralPropertyUi.ui @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 01f6e7452..c11e67453 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -69,10 +69,10 @@ private: int m_pos; }; -const KoGuides::SnaptqStatus KoGuides::SNAP_NONE = 0; -const KoGuides::SnaptqStatus KoGuides::SNAP_HORIZ = 1; -const KoGuides::SnaptqStatus KoGuides::SNAP_VERT = 2; -const KoGuides::SnaptqStatus KoGuides::SNAP_BOTH = 3; +const KoGuides::SnapStatus KoGuides::SNAP_NONE = 0; +const KoGuides::SnapStatus KoGuides::SNAP_HORIZ = 1; +const KoGuides::SnapStatus KoGuides::SNAP_VERT = 2; +const KoGuides::SnapStatus KoGuides::SNAP_BOTH = 3; KoGuides::KoGuides( KoView *view, KoZoomHandler *zoomHandler ) : m_view( view ) @@ -365,11 +365,11 @@ void KoGuides::getGuideLines( TQValueList<double> &horizontalPos, TQValueList<do } -void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ) +void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff ) { - if( !(snaptqStatus & SNAP_VERT)) + if( !(snapStatus & SNAP_VERT)) diff.setX(10000); - if( !(snaptqStatus & SNAP_HORIZ)) + if( !(snapStatus & SNAP_HORIZ)) diff.setY(10000); for ( int i = 0; i < GL_END; ++i ) @@ -380,60 +380,60 @@ void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqSta if ( ( *it )->orientation == Qt::Horizontal ) { double tmp = (*it)->position - rect.top(); - if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) + if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) { if(TQABS( tmp ) < TQABS(diff.y())) { diff.setY( tmp ); - snaptqStatus |= SNAP_HORIZ; + snapStatus |= SNAP_HORIZ; } } tmp = (*it)->position - rect.bottom(); - if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) + if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) { if(TQABS( tmp ) < TQABS(diff.y())) { diff.setY( tmp ); - snaptqStatus |= SNAP_HORIZ; + snapStatus |= SNAP_HORIZ; } } } else { double tmp = (*it)->position - rect.left(); - if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) + if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) { if(TQABS( tmp ) < TQABS(diff.x())) { diff.setX( tmp ); - snaptqStatus |= SNAP_VERT; + snapStatus |= SNAP_VERT; } } tmp = (*it)->position - rect.right(); - if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) + if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) { if(TQABS( tmp ) < TQABS(diff.x())) { diff.setX( tmp ); - snaptqStatus |= SNAP_VERT; + snapStatus |= SNAP_VERT; } } } } } - if(!(snaptqStatus & SNAP_VERT)) + if(!(snapStatus & SNAP_VERT)) diff.setX( 0 ); - if(!(snaptqStatus & SNAP_HORIZ)) + if(!(snapStatus & SNAP_HORIZ)) diff.setY( 0 ); } -void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ) +void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff ) { - if( !(snaptqStatus & SNAP_VERT)) + if( !(snapStatus & SNAP_VERT)) diff.setX(10000); - if( !(snaptqStatus & SNAP_HORIZ)) + if( !(snapStatus & SNAP_HORIZ)) diff.setY(10000); for ( int i = 0; i < GL_END; ++i ) @@ -444,34 +444,34 @@ void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqSta if ( ( *it )->orientation == Qt::Horizontal ) { double tmp = (*it)->position - pos.y(); - if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) + if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) { if(TQABS( tmp ) < TQABS(diff.y())) { diff.setY( tmp ); - snaptqStatus |= SNAP_HORIZ; + snapStatus |= SNAP_HORIZ; } } } else { double tmp = (*it)->position - pos.x(); - if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) + if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) { if(TQABS( tmp ) < TQABS(diff.x())) { diff.setX( tmp ); - snaptqStatus |= SNAP_VERT; + snapStatus |= SNAP_VERT; } } } } } - if(!(snaptqStatus & SNAP_VERT)) + if(!(snapStatus & SNAP_VERT)) diff.setX( 0 ); - if(!(snaptqStatus & SNAP_HORIZ)) + if(!(snapStatus & SNAP_HORIZ)) diff.setY( 0 ); } @@ -530,7 +530,7 @@ void KoGuides::repaintSnapping( const KoRect &snappedRect ) } -void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus ) +void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus ) { bool needRepaint = false; for ( int i = 0; i < GL_END; ++i ) @@ -538,7 +538,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptq TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal && ( snaptqStatus & SNAP_HORIZ ) ) + if ( ( *it )->orientation == Qt::Horizontal && ( snapStatus & SNAP_HORIZ ) ) { if( virtuallyEqual( snappedPoint.y(), (*it)->position ) ) { @@ -556,7 +556,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptq } else { - if ( snaptqStatus & SNAP_VERT ) + if ( snapStatus & SNAP_VERT ) { if( virtuallyEqual( snappedPoint.x(), (*it)->position ) ) { diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h index b98b04728..7a28962f0 100644 --- a/lib/kofficeui/KoGuides.h +++ b/lib/kofficeui/KoGuides.h @@ -58,8 +58,8 @@ public: */ void paintGuides( TQPainter &painter ); - typedef int SnaptqStatus; - static const SnaptqStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH; + typedef int SnapStatus; + static const SnapStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH; /** * @brief Handle mousePressEvent @@ -148,17 +148,17 @@ public: * @brief Snap rect to guidelines * * This looks for a guide which is in reach for the guide as defined in snap. - * This method has the abillity to combine more calls. The snaptqStatus and diff args are both input and - * output. On first call you should set snaptqStatus to 0. The return value would then show in which + * This method has the abillity to combine more calls. The snapStatus and diff args are both input and + * output. On first call you should set snapStatus to 0. The return value would then show in which * directions it has snapped. If you combine several KoGuides you can let these output arguments * be input for the next koGuide. That way you'll always catch the nearest guide. * * @param rect the rect which should be snapped * @param snap the distance within the guide should snap - but always snap if already snapped - * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param). + * @param snapStatus if horiz,vert or both directions are snapped (both in and out param). * @param diff distance away from guide. Only valid if status is snapping (both in and out param) */ - void snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ); + void snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff ); /** * @brief Snap rect to guidelines @@ -167,10 +167,10 @@ public: * * @param pos the position which should be snapped * @param snap the distance wherein the guide should snap - but always snap if already snapped - * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param) + * @param snapStatus if horiz,vert or both directions are snapped (both in and out param) * @param diff distance away from guide. Only valid if status is snapping (both in and out param) */ - void snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ); + void snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff ); /** * @brief tqrepaint guides if any changed snapping status @@ -188,7 +188,7 @@ public: * * @param snappedPoint the point after it has been snapped */ - void repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus ); + void repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus ); /** * @brief tqrepaint guides so none is snapped diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index 342889c42..098a48808 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -484,7 +484,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) else recentFile->insertStringList( lst); - recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); connect( recentFile , TQT_SIGNAL(highlighted ( const TQString &)), this, TQT_SLOT( slotSelectRecentFile( const TQString & ))); diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp index 5f42caae3..1db0ee9b7 100644 --- a/lib/kofficeui/KoKoolBar.cpp +++ b/lib/kofficeui/KoKoolBar.cpp @@ -218,7 +218,7 @@ KoKoolBarBox::KoKoolBarBox( KoKoolBar *_bar ) : setFrameShape( StyledPanel ); setFrameShadow( Sunken ); // setBackgroundMode( PaletteBase ); - setBackgroundColor( tqcolorGroup().background() ); + setBackgroundColor( colorGroup().background() ); } void KoKoolBarBox::setActiveGroup( KoKoolBarGroup *_grp ) diff --git a/lib/kofficeui/KoPageLayoutColumnsBase.ui b/lib/kofficeui/KoPageLayoutColumnsBase.ui index 325fe45e7..07cced255 100644 --- a/lib/kofficeui/KoPageLayoutColumnsBase.ui +++ b/lib/kofficeui/KoPageLayoutColumnsBase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui index b3bd79783..41246d840 100644 --- a/lib/kofficeui/KoPageLayoutHeaderBase.ui +++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index 6ddf9409e..111ba21b4 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -160,9 +160,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou // ------------- spacers ----------- TQWidget* spacer1 = new TQWidget( this ); TQWidget* spacer2 = new TQWidget( this ); - spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); grid1->addWidget( spacer1, 4, 0 ); grid1->addWidget( spacer2, 4, 1 ); diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index ca24b89ad..17bda1e34 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -64,7 +64,7 @@ void KoPartSelectAction::init() // Called when selecting a part void KoPartSelectAction::slotActionActivated() { - TQString servName = TQString::tqfromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); + TQString servName = TQString::fromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); KService::Ptr serv = KService::serviceByName( servName ); m_documentEntry = KoDocumentEntry( serv ); emit activated(); diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp index b5271b971..144b8a08d 100644 --- a/lib/kofficeui/KoPartSelectDia.cpp +++ b/lib/kofficeui/KoPartSelectDia.cpp @@ -56,7 +56,7 @@ KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) : selectionChanged( 0 ); setFocus(); - resize( listview->tqsizeHint().width() + 20, 300 ); + resize( listview->sizeHint().width() + 20, 300 ); } void KoPartSelectDia::selectionChanged( TQListViewItem *item ) diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index 212becd79..cc8f51896 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -209,12 +209,12 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) // Use a double-buffer pixmap TQPainter p( &buffer ); - p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); int totalw = tqRound( zoomIt(d->tqlayout.ptWidth) ); TQString str; - p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) ); + p.setBrush( colorGroup().brush( TQColorGroup::Base ) ); // Draw white rect TQRect r; @@ -279,13 +279,13 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) // Draw ending bar (at page width) //int constant=zoomIt(1); //p.drawLine( totalw - diffx + constant, 1, totalw - diffx + constant, height() - 1 ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( totalw - diffx, 1, totalw - diffx, height() - 1 ); // Draw starting bar (at 0) - //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + //p.setPen( colorGroup().color( TQColorGroup::Text ) ); //p.drawLine( -diffx, 1, -diffx, height() - 1 ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( -diffx - constant, 1, -diffx - constant, height() - 1 ); // Draw the indents triangles @@ -307,7 +307,7 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) // Show the mouse position if ( d->action == A_NONE && showMPos ) { - p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + p.setPen( colorGroup().color( TQColorGroup::Text ) ); p.drawLine( mposX, 1, mposX, height() - 1 ); } hasToDelete = false; @@ -325,7 +325,7 @@ void KoRuler::drawTabs( TQPainter &_painter ) { int ptPos = 0; - _painter.setPen( TQPen( tqcolorGroup().color( TQColorGroup::Text ), 2, SolidLine ) ); + _painter.setPen( TQPen( colorGroup().color( TQColorGroup::Text ), 2, SolidLine ) ); // Check if we're in a mousemove event, removing a tab. // In that case, we'll have to skip drawing that one. bool willRemove = d->mousePressed && willRemoveTab( d->oldMy ) && d->currTab.type != T_INVALID; @@ -356,7 +356,7 @@ void KoRuler::drawTabs( TQPainter &_painter ) _painter.drawLine( ptPos + 4, height() - 4, ptPos + 20 - 4, height() - 4 ); _painter.drawLine( ptPos + 20 / 2, 4, ptPos + 20 / 2, height() - 4 ); _painter.fillRect( ptPos + 20 / 2 + 2, height() - 9, 3, 3, - tqcolorGroup().color( TQColorGroup::Text ) ); + colorGroup().color( TQColorGroup::Text ) ); } break; default: break; } @@ -371,7 +371,7 @@ void KoRuler::drawVertical( TQPainter *_painter ) resize( TQMAX( fm.height() + 4, 20 ), height() ); TQPainter p( &buffer ); - p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); int totalh = tqRound( zoomIt(d->tqlayout.ptHeight) ); // Clip rect - this gives basically always a rect like (2,2,width-2,height-2) @@ -382,7 +382,7 @@ void KoRuler::drawVertical( TQPainter *_painter ) if ( paintRect.intersects( rulerRect ) ) { TQString str; - p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) ); + p.setBrush( colorGroup().brush( TQColorGroup::Base ) ); // Draw white rect TQRect r; @@ -454,19 +454,19 @@ void KoRuler::drawVertical( TQPainter *_painter ) // Draw ending bar (at page height) //p.drawLine( 1, totalh - diffy + 1, width() - 1, totalh - diffy + 1 ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( 1, totalh - diffy, width() - 1, totalh - diffy ); // Draw starting bar (at 0) - //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + //p.setPen( colorGroup().color( TQColorGroup::Text ) ); //p.drawLine( 1, -diffy, width() - 1, -diffy ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( 1, -diffy - 1, width() - 1, -diffy - 1 ); } // Show the mouse position if ( d->action == A_NONE && showMPos ) { - p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + p.setPen( colorGroup().color( TQColorGroup::Text ) ); p.drawLine( 1, mposY, width() - 1, mposY ); } hasToDelete = false; @@ -1176,7 +1176,7 @@ void KoRuler::slotMenuActivated( int i ) } } -TQSize KoRuler::tqminimumSizeHint() const +TQSize KoRuler::minimumSizeHint() const { TQSize size; TQFont font = KGlobalSettings::toolBarFont(); @@ -1188,9 +1188,9 @@ TQSize KoRuler::tqminimumSizeHint() const return size; } -TQSize KoRuler::tqsizeHint() const +TQSize KoRuler::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KoRuler::setPageLayout( const KoPageLayout& _layout ) diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h index 5cea5678f..52dcecd07 100644 --- a/lib/kofficeui/KoRuler.h +++ b/lib/kofficeui/KoRuler.h @@ -246,12 +246,12 @@ public: /** * Reimplemented from TQWidget */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * Reimplemented from TQWidget */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: void newPageLayout( const KoPageLayout & ); diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index e33ce12c2..a7ffe145a 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -273,20 +273,20 @@ void KoTabBarPrivate::drawTab( TQPainter& painter, TQRect& rect, const TQString& painter.save(); // fill it first - TQBrush bg = tabbar->tqcolorGroup().background(); - if( active ) bg = TQBrush(tabbar->tqcolorGroup().base()); + TQBrush bg = tabbar->colorGroup().background(); + if( active ) bg = TQBrush(tabbar->colorGroup().base()); painter.setBrush( bg ); painter.setPen( TQPen( TQt::NoPen ) ); painter.drawPolygon( polygon ); // draw the lines - painter.setPen( tabbar->tqcolorGroup().dark() ); + painter.setPen( tabbar->colorGroup().dark() ); if( !active ) painter.drawLine( rect.x()-25, rect.y(), rect.right()+25, rect.top() ); // TQt4: painter.setRenderHint( TQPainter::Antialiasing ); painter.drawPolyline( polygon ); - painter.setPen( tabbar->tqcolorGroup().buttonText() ); + painter.setPen( tabbar->colorGroup().buttonText() ); TQFont f = painter.font(); if( active ) f.setBold( true ); painter.setFont( f ); @@ -660,10 +660,10 @@ void KoTabBar::paintEvent( TQPaintEvent* ) TQPainter painter; TQPixmap pm( size() ); - pm.fill( tqcolorGroup().background() ); + pm.fill( colorGroup().background() ); painter.tqbegin( TQT_TQPAINTDEVICE(&pm), this ); - painter.setPen( tqcolorGroup().dark() ); + painter.setPen( colorGroup().dark() ); painter.drawLine( 0, 0, width(), 0 ); if( !d->reverseLayout ) @@ -722,9 +722,9 @@ void KoTabBar::resizeEvent( TQResizeEvent* ) update(); } -TQSize KoTabBar::tqsizeHint() const +TQSize KoTabBar::sizeHint() const { - return TQSize( 40, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, this ) ); + return TQSize( 40, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) ); } void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name ) diff --git a/lib/kofficeui/KoTabBar.h b/lib/kofficeui/KoTabBar.h index 39cf03b8c..0c4233b4e 100644 --- a/lib/kofficeui/KoTabBar.h +++ b/lib/kofficeui/KoTabBar.h @@ -219,7 +219,7 @@ public slots: */ void clear(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; signals: diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 1e5261330..880c447bc 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -433,7 +433,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou KoTCDIconCanvas *canvas = new KoTCDIconCanvas( frame ); tqlayout->addWidget(canvas,0,0); - canvas->setBackgroundColor( tqcolorGroup().base() ); + canvas->setBackgroundColor( colorGroup().base() ); canvas->setResizeMode(TQIconView::Adjust); canvas->setWordWrapIconText( true ); canvas->show(); @@ -642,7 +642,7 @@ void KoTemplateChooseDia::slotOk() static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" }; if ( d->m_returnType <= Empty ) { - grp.writeEntry( "LastReturnType", TQString::tqfromLatin1(s_returnTypes[d->m_returnType]) ); + grp.writeEntry( "LastReturnType", TQString::fromLatin1(s_returnTypes[d->m_returnType]) ); if (d->m_returnType == Template) { grp.writeEntry( "TemplateTab", d->m_jwidget->activePageIndex() ); @@ -793,12 +793,12 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item ) // and another one for deciding what's the text of the tooltip... const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo(); TQString toolTipText = fi->url().prettyURL( 0, KURL::StripFileProtocol ); - toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").tqarg(toolTipText), 0, + toolTip = new TQLabel( TQString::fromLatin1(" %1 ").tqarg(toolTipText), 0, "myToolTip", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); toolTip->setLineWidth( 1 ); - toolTip->tqsetAlignment( AlignLeft | AlignTop ); + toolTip->setAlignment( AlignLeft | AlignTop ); toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) ); toolTip->adjustSize(); TQRect screen = TQApplication::desktop()->screenGeometry( @@ -810,7 +810,7 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item ) toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y()); } toolTip->setFont( TQToolTip::font() ); - toolTip->tqsetPalette( TQToolTip::palette(), TRUE ); + toolTip->setPalette( TQToolTip::palette(), TRUE ); toolTip->show(); } diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 7260bbea6..3ac7cb453 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -53,12 +53,12 @@ KoColorPanel::~KoColorPanel() { } -TQSize KoColorPanel::tqsizeHint() const +TQSize KoColorPanel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize KoColorPanel::tqminimumSizeHint() const +TQSize KoColorPanel::minimumSizeHint() const { return TQSize( COLS << 4, lines() << 4 ); } @@ -109,7 +109,7 @@ void KoColorPanel::clear() if ( m_colorMap.isEmpty() ) return; - TQSize area( tqminimumSizeHint() ); + TQSize area( minimumSizeHint() ); m_colorMap.clear(); init(); updateGeometry(); @@ -369,7 +369,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e ) if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 && mapFromPosition( m_focusPosition ).intersects( e->rect() ) ) tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), - tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); + colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); --lns; // Attention: We just avoid some lns - 1 statements @@ -580,7 +580,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition ) if ( it != m_colorMap.end() ) { // draw at the new focus position tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), - tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); + colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() ); } @@ -663,21 +663,21 @@ KoToolButton::~KoToolButton() { } -TQSize KoToolButton::tqsizeHint() const +TQSize KoToolButton::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize KoToolButton::tqminimumSizeHint() const +TQSize KoToolButton::minimumSizeHint() const { - TQSize size = KToolBarButton::tqminimumSizeHint(); + TQSize size = KToolBarButton::minimumSizeHint(); size.setWidth( size.width() + ARROW_WIDTH ); return size; } -TQSize KoToolButton::tqminimumSize() const +TQSize KoToolButton::minimumSize() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KoToolButton::colorSelected( const TQColor& color ) @@ -691,7 +691,7 @@ void KoToolButton::drawButton(TQPainter *_painter) TQStyle::SCFlags active = TQStyle::SC_None; TQStyle::SCFlags arrowActive = TQStyle::SC_None; TQStyleOption opt; - TQColorGroup cg( tqcolorGroup() ); + TQColorGroup cg( colorGroup() ); if ( isEnabled() ) { flags |= TQStyle::Style_Enabled; @@ -712,10 +712,10 @@ void KoToolButton::drawButton(TQPainter *_painter) // Draw styled toolbuttons _painter->setClipRect( 0, 0, width() - ARROW_WIDTH, height() ); - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg, + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg, flags, TQStyle::SC_ToolButton, active, opt ); _painter->setClipRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() ); - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg, + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg, arrowFlags, TQStyle::SC_ToolButton, arrowActive, opt ); _painter->setClipping( false ); @@ -724,7 +724,7 @@ void KoToolButton::drawButton(TQPainter *_painter) cg, flags, opt ); if ( KToolBarButton::isRaised() || m_arrowPressed ) - qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, tqcolorGroup(), true ); + qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, colorGroup(), true ); int dx, dy; TQFont tmp_font( KGlobalSettings::toolBarFont() ); @@ -802,7 +802,7 @@ void KoToolButton::drawButton(TQPainter *_painter) else if( KToolBarButton::isRaised() ) _painter->setPen( KGlobalSettings::toolBarHighlightColor() ); else - _painter->setPen( tqcolorGroup().buttonText() ); + _painter->setPen( colorGroup().buttonText() ); _painter->drawText( textRect, textFlags, textLabel() ); } } @@ -838,15 +838,15 @@ void KoToolButton::init() // We are interested in the mouse clicks on the arrow button m_popup->installEventFilter( this ); - ARROW_WIDTH = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator) + 4; + ARROW_WIDTH = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator) + 4; kdDebug() << "##################### Arrow: " << ARROW_WIDTH << endl; } void KoToolButton::buttonShift( int& dx, int& dy ) { if ( isDown() && !m_arrowPressed ) { - dx += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ); - dy += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ); + dx += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ); + dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ); } } diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h index 1374f6d28..804b270b6 100644 --- a/lib/kofficeui/KoTooluButton.h +++ b/lib/kofficeui/KoTooluButton.h @@ -34,8 +34,8 @@ public: KoColorPanel( TQWidget* parent = 0, const char* name = 0 ); virtual ~KoColorPanel(); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; enum MenuStyle { Plain, CustomColors }; static TQPopupMenu* createColorPopup( MenuStyle style, const TQColor& defaultColor, @@ -163,9 +163,9 @@ public: virtual ~KoToolButton(); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqminimumSize() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize minimumSize() const; public slots: void colorSelected( const TQColor& color ); diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index 476e35b34..89d9dbc81 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -223,7 +223,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name ) : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -235,7 +235,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); setValidator( m_validator ); setUnit( unit ); @@ -287,7 +287,7 @@ double KoUnitDoubleLineEdit::value( void ) const KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); lineEdit()->setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -300,7 +300,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); lineEdit()->setValidator( m_validator ); setUnit( unit ); diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index c0da86e93..2618a8e01 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -266,7 +266,7 @@ int KSelectColorAction::plug( TQWidget* w, int index ) menu->setItemEnabled( id, false ); if ( !whatsThis().isEmpty() ) - menu->tqsetWhatsThis( id, whatsThisWithIcon() ); + menu->setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); @@ -341,7 +341,7 @@ TQString KSelectColorAction::whatsThisWithIcon() const { TQString text = whatsThis(); if (!icon().isEmpty()) - return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").tqarg(icon()).tqarg(text); + return TQString::fromLatin1("<img source=\"small|%1\"> %2").tqarg(icon()).tqarg(text); return text; } diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index 729285bb8..9dfd066c9 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -36,19 +36,19 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, name ) { - setCaption( TQString::tqfromLatin1( "KColorAction test application" ) ); + setCaption( TQString::fromLatin1( "KColorAction test application" ) ); TQWidget *w = new TQWidget( this ); setCentralWidget( w ); TQBoxLayout* l = new TQHBoxLayout( w, KDialog::marginHint(), KDialog::spacingHint() ); - TQGroupBox* b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 1" ), w ); + TQGroupBox* b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 1" ), w ); panel = new KoColorPanel( b1, "panel1" ); connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), TQT_SLOT( slotColorSelected( const TQColor& ) ) ); //panel->insertDefaultColors(); l->addWidget( b1 ); - b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 2" ), w ); + b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 2" ), w ); ( void ) new KoColorPanel( b1, "panel2" ); l->addWidget( b1 ); diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp index 6a7d198a7..da88a7c1b 100644 --- a/lib/kofficeui/tkaction.cpp +++ b/lib/kofficeui/tkaction.cpp @@ -166,9 +166,9 @@ void TKAction::updateLayout(TQWidget* base) } else pixLabel->hide(); - base->setFixedWidth( w->tqsizeHint().width() + - (textLabel->isVisible() ? textLabel->tqsizeHint().width():0) + - (pixLabel->isVisible() ? pixLabel->tqsizeHint().width():0) ); + base->setFixedWidth( w->sizeHint().width() + + (textLabel->isVisible() ? textLabel->sizeHint().width():0) + + (pixLabel->isVisible() ? pixLabel->sizeHint().width():0) ); } /******************************************************************************/ TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name ) @@ -191,7 +191,7 @@ int TKBaseSelectAction::plug(TQWidget* widget, int index) TKComboBox* cb = new TKComboBox(m_editable,bar); initComboBox(cb); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); TQWidget* base = createLayout(bar,cb); bar->insertWidget( id_, 100, base, index ); diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp index d1cb7ac20..cd20f7901 100644 --- a/lib/kofficeui/tkcombobox.cpp +++ b/lib/kofficeui/tkcombobox.cpp @@ -59,7 +59,7 @@ void TKComboBox::paintEvent(TQPaintEvent*) int bh = height()-4; TQPainter p( this ); - const TQColorGroup& g = tqcolorGroup(); + const TQColorGroup& g = colorGroup(); TQRect fr(2,2,width()-4,height()-4); @@ -87,8 +87,8 @@ void TKComboBox::paintEvent(TQPaintEvent*) TQPixmap pixmap(arrow_down); - tqstyle().tqdrawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), tqcolorGroup() ); - tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, tqcolorGroup(), isEnabled(), &pixmap, TQString() ); + tqstyle().drawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), colorGroup() ); + tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() ); if ( hasFocus()) { tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g ); diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index b0520a2c1..5436496fa 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -353,14 +353,14 @@ void TKToolBarButton::drawButton( TQPainter* p ) #define DRAW_PIXMAP_AND_TEXT \ int x = 3;\ if (pixmap()) {\ - tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, tqcolorGroup(), isEnabled(), pixmap(), TQString() );\ + tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\ if (d->m_iconMode==TK::IconAndText && !d->m_text.isEmpty()) {\ x += pixmap()->width() + 3;\ }\ }\ if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty()) {\ TQFontMetrics fm(KGlobalSettings::toolBarFont());\ - tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, tqcolorGroup(), isEnabled(), 0, d->m_text );\ + tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\ } const char* arrow[] = { @@ -384,20 +384,20 @@ void TKToolBarButton::drawButton( TQPainter* p ) if (d->m_isRaised) flags |= TQStyle::Style_Raised; if (hasFocus()) flags |= TQStyle::Style_HasFocus; - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton ); - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton ); - tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, tqcolorGroup(), isEnabled(), &arrow_pix, TQString() ); + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); + tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() ); if ( d->m_isRaised ) - qDrawShadeLine( p, width()-12, 0, width()-12, height(), tqcolorGroup(), true ); + qDrawShadeLine( p, width()-12, 0, width()-12, height(), colorGroup(), true ); DRAW_PIXMAP_AND_TEXT } else { - tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f ); + tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : tqpalette().disabled(), f ); DRAW_PIXMAP_AND_TEXT int z = f ? 1:0; p->drawPixmap(width()-11+z,(height()-4)/2+z ,arrow_pix); } } else { - tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f ); + tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : tqpalette().disabled(), f ); DRAW_PIXMAP_AND_TEXT } } @@ -430,14 +430,14 @@ void TKToolBarButton::makeDisabledPixmap() disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState); } -TQSize TKToolBarButton::tqsizeHint() const +TQSize TKToolBarButton::sizeHint() const { - return tqminimumSize(); + return minimumSize(); } -TQSize TKToolBarButton::tqminimumSizeHint() const +TQSize TKToolBarButton::minimumSizeHint() const { - return tqminimumSize(); + return minimumSize(); } void TKToolBarButton::showMenu() diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h index 3cec2f575..883d7811d 100644 --- a/lib/kofficeui/tktoolbarbutton.h +++ b/lib/kofficeui/tktoolbarbutton.h @@ -180,8 +180,8 @@ public: TQPixmap getActivePixmap() const; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; signals: void buttonClicked(); diff --git a/lib/kopainter/koFrameButton.cc b/lib/kopainter/koFrameButton.cc index c87fe2309..d5f2dada0 100644 --- a/lib/kopainter/koFrameButton.cc +++ b/lib/kopainter/koFrameButton.cc @@ -37,7 +37,7 @@ TQLabel(parent, name) setFrameStyle(Panel | Raised); setLineWidth(1); setText(text); - tqsetAlignment(AlignHCenter | AlignVCenter); + setAlignment(AlignHCenter | AlignVCenter); mActive = false; mToggle = false; } diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc index 1eb9eeced..e1230d802 100644 --- a/lib/kopainter/ko_cmyk_widget.cc +++ b/lib/kopainter/ko_cmyk_widget.cc @@ -41,7 +41,7 @@ KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 4, 5, 5, 2); /* setup color sliders */ diff --git a/lib/kopainter/ko_color_wheel.cc b/lib/kopainter/ko_color_wheel.cc index 0c2688499..f309125ca 100644 --- a/lib/kopainter/ko_color_wheel.cc +++ b/lib/kopainter/ko_color_wheel.cc @@ -49,7 +49,7 @@ void KoColorWheel::drawWheel( TQPixmap *pixmap ) TQPoint center(size/2, size/2); TQImage image( size, size, 32 ); - image.fill(tqcolorGroup ().background().pixel()); + image.fill(colorGroup ().background().pixel()); TQColor col; int a, b, h, s; diff --git a/lib/kopainter/ko_gray_widget.cc b/lib/kopainter/ko_gray_widget.cc index e40031b5a..6e321152c 100644 --- a/lib/kopainter/ko_gray_widget.cc +++ b/lib/kopainter/ko_gray_widget.cc @@ -36,7 +36,7 @@ KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, n m_ColorButton = new KDualColorButton(this); Q_CHECK_PTR(m_ColorButton); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2); /* setup color sliders */ diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc index c870248a2..8b2e556c5 100644 --- a/lib/kopainter/ko_hsv_widget.cc +++ b/lib/kopainter/ko_hsv_widget.cc @@ -37,7 +37,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 5, 7, 5, 2); m_colorwheel = new KoColorWheel(this); @@ -96,7 +96,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam connect(mSIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSChanged(int))); connect(mVIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVChanged(int))); - //setFixedSize(mGrid -> tqminimumSize()); + //setFixedSize(mGrid -> minimumSize()); m_autovalue = true; // So on the initial selection of h or v, s gets set to 255. update(TQt::black, TQt::white); diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc index 5eaef38e8..7e8b69f99 100644 --- a/lib/kopainter/ko_rgb_widget.cc +++ b/lib/kopainter/ko_rgb_widget.cc @@ -38,7 +38,7 @@ KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2); /* setup color sliders */ diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 600dad1cc..047743692 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -82,7 +82,7 @@ KoPalette::~KoPalette() void KoPalette::setMainWidget(TQWidget * widget) { setWidget(widget); - resize( TQSize(285, 233).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(285, 233).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); widget->setFont(m_font); m_page = widget; diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 6ffdcf5c3..7f8bb11a3 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -366,7 +366,7 @@ Editor::changeSetInternal(Set *set, bool preservePrevSelection, const TQCString& if (item) { d->itemToSelectLater = item; TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater())); - //d->doNotSetFocusOnSelection = !hasParent(this, tqfocusWidget()); + //d->doNotSetFocusOnSelection = !hasParent(this, focusWidget()); //setSelected(item, true); //d->doNotSetFocusOnSelection = false; // ensureItemVisible(item); @@ -590,7 +590,7 @@ Editor::slotClicked(TQListViewItem *it) if (d->currentWidget) { if (d->currentWidget->visibleFlag()) { d->currentWidget->show(); - if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->tqfocusWidget()) )) + if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->focusWidget()) )) d->currentWidget->setFocus(); } } @@ -720,7 +720,7 @@ Editor::updateGroupLabelsPosition() EditorGroupItem *group = dynamic_cast<EditorGroupItem*>(d->topItem->firstChild()); while(group) { - TQRect r = tqitemRect((TQListViewItem*) group); + TQRect r = itemRect((TQListViewItem*) group); if(group->label()) { group->label()->setGeometry(r); group->label()->tqrepaint(); @@ -747,7 +747,7 @@ Editor::showUndoButton( bool show ) if (!d->currentItem || !d->currentWidget || (d->currentWidget && d->currentWidget->isReadOnly())) return; - int y = viewportToContents(TQPoint(0, tqitemRect(d->currentItem).y())).y(); + int y = viewportToContents(TQPoint(0, itemRect(d->currentItem).y())).y(); TQRect tqgeometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height()); d->undoButton->resize(d->baseRowHeight, d->currentItem->height()); @@ -869,10 +869,10 @@ Editor::slotColumnSizeChanged(int section) } TQSize -Editor::tqsizeHint() const +Editor::sizeHint() const { return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+" "), - KListView::tqsizeHint().height()); + KListView::sizeHint().height()); } void diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h index c3ab0c2e8..05725529b 100644 --- a/lib/koproperty/editor.h +++ b/lib/koproperty/editor.h @@ -77,7 +77,7 @@ class KOPROPERTY_EXPORT Editor : public KListView virtual ~Editor(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void setFocus(); virtual void setSorting( int column, bool ascending = true ); diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 653cbe0ab..8c34a5e35 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -98,7 +98,7 @@ class GroupWidgetBase : public TQWidget , m_isOpen(true) , m_mouseDown(false) { - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); } void setText( const TQString &text ) @@ -121,9 +121,9 @@ class GroupWidgetBase : public TQWidget m_isOpen = set; } - virtual TQSize tqsizeHint () const + virtual TQSize sizeHint () const { - TQSize s( TQWidget::tqsizeHint() ); + TQSize s( TQWidget::sizeHint() ); s.setHeight(fontMetrics().height()*2); return s; } @@ -208,7 +208,7 @@ GroupContainer::GroupContainer(const TQString& title, TQWidget* parent) : TQWidget(parent) , d(new Private()) { - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); d->lyr = new TQVBoxLayout(this); d->groupWidget = new GroupWidgetBase(this); d->groupWidget->setText( title ); @@ -563,7 +563,7 @@ EditorGroupItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, in // return; /*p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR ); //! \todo custom color? - p->setClipRect(listView()->tqitemRect(this)); + p->setClipRect(listView()->itemRect(this)); if(column == 1) p->translate(-listView()->columnWidth(0) + 20, 0); int totalWidth = listView()->columnWidth(0) + listView()->columnWidth(1) - 20; diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index 886f20d86..da3fd994d 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -45,7 +45,7 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name) m_toggle->setFocusPolicy(TQ_WheelFocus); m_toggle->setUsesTextLabel(true); m_toggle->setTextPosition(TQToolButton::Right); - m_toggle->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_toggle->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); //we're not using tqlayout to because of problems with button size m_toggle->move(0, 0); m_toggle->resize(width(), height()); diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp index a9ab1f1a1..3b2bfce00 100644 --- a/lib/koproperty/editors/coloredit.cpp +++ b/lib/koproperty/editors/coloredit.cpp @@ -36,7 +36,7 @@ ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name) m_edit = new KColorCombo(this); m_edit->setFocusPolicy(TQ_NoFocus); connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); setFocusWidget(m_edit); diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp index 343a9ed9b..b9606e0e8 100644 --- a/lib/koproperty/editors/combobox.cpp +++ b/lib/koproperty/editors/combobox.cpp @@ -37,7 +37,7 @@ ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KComboBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp index 0df8532a9..11c36a54c 100644 --- a/lib/koproperty/editors/dateedit.cpp +++ b/lib/koproperty/editors/dateedit.cpp @@ -37,7 +37,7 @@ DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp index 6e12641ab..6ab541de2 100644 --- a/lib/koproperty/editors/datetimeedit.cpp +++ b/lib/koproperty/editors/datetimeedit.cpp @@ -37,7 +37,7 @@ DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *nam { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateTimeEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 634641b88..f85279cee 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -61,7 +61,7 @@ class FontEditRequester : public KFontRequester button()->setText(i18n("...")); TQToolTip::add(button(), i18n("Change font")); button()->setFocusPolicy(TQ_NoFocus); - button()->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + button()->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQFontMetrics fm(button()->font()); button()->setFixedWidth(fm.width(button()->text()+' ')); } diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp index e7f5b2f86..b8345390c 100644 --- a/lib/koproperty/editors/linestyledit.cpp +++ b/lib/koproperty/editors/linestyledit.cpp @@ -140,7 +140,7 @@ LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *n { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 92ab746db..17f6d508c 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -58,16 +58,16 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name) m_edit = new TQLabel(this, "m_edit"); TQToolTip::add(m_edit, i18n("Click to show image preview")); - m_edit->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + m_edit->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); m_edit->setMinimumHeight(5); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); m_edit->setBackgroundMode(TQt::PaletteBase); m_edit->setMouseTracking(true); setBackgroundMode(TQt::PaletteBase); m_button = new TQPushButton(i18n("..."), this, "m_button"); TQToolTip::add(m_button, i18n("Insert image from file")); - m_button->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_button->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQFontMetrics fm(m_button->font()); m_button->setFixedWidth(fm.width(m_button->text()+' ')); m_button->setFocusPolicy(TQ_NoFocus); diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp index 6983dd682..fee526627 100644 --- a/lib/koproperty/editors/pointedit.cpp +++ b/lib/koproperty/editors/pointedit.cpp @@ -44,7 +44,7 @@ PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name) m_edit->setPaletteBackgroundColor(tqpalette().active().base()); m_edit->setWordWrap( TQTextEdit::NoWrap ); // m_edit->setBackgroundMode(TQt::PaletteBase); -// m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); +// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); // setFocusWidget(m_edit); diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp index 05422119b..2fa29bc47 100644 --- a/lib/koproperty/editors/sizeedit.cpp +++ b/lib/koproperty/editors/sizeedit.cpp @@ -43,7 +43,7 @@ SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name) // m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); m_edit->setPaletteBackgroundColor(tqpalette().active().base()); // m_edit->setBackgroundMode(TQt::PaletteBase); -// m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); +// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); // setFocusWidget(m_edit); diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp index 125e0a26f..7722d4a26 100644 --- a/lib/koproperty/editors/sizepolicyedit.cpp +++ b/lib/koproperty/editors/sizepolicyedit.cpp @@ -42,7 +42,7 @@ SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char m_edit = new TQLabel(this); m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); m_edit->setBackgroundMode(TQt::PaletteBase); -// m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); +// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); // l->addWidget(m_edit); diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 8e890419b..8c9dbab9c 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -36,7 +36,7 @@ using namespace KoProperty; IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *parent, const char *name) : KIntSpinBox(lower, upper, step, value, base, parent, name) { - editor()->tqsetAlignment(TQt::AlignLeft); + editor()->setAlignment(TQt::AlignLeft); installEventFilter(editor()); installEventFilter(this); TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); @@ -179,7 +179,7 @@ IntEdit::setReadOnlyInternal(bool readOnly) DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *parent) : KDoubleSpinBox(lower, upper, step, value, precision, parent) { - editor()->tqsetAlignment(TQt::AlignLeft); + editor()->setAlignment(TQt::AlignLeft); installEventFilter(editor()); installEventFilter(this); TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); @@ -247,7 +247,7 @@ DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name) 0, precision.toInt(), this); if (!minValueText.isNull()) m_edit->setSpecialValueText(minValueText.toString()); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp index 55d8b3ed4..1b61a251d 100644 --- a/lib/koproperty/editors/stringedit.cpp +++ b/lib/koproperty/editors/stringedit.cpp @@ -31,7 +31,7 @@ StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMargin(1); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp index 56bf1145c..fe599e582 100644 --- a/lib/koproperty/editors/stringlistedit.cpp +++ b/lib/koproperty/editors/stringlistedit.cpp @@ -46,12 +46,12 @@ StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char m_edit = new TQLineEdit(this); m_edit->setLineWidth(0); m_edit->setReadOnly(true); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); m_selectButton = new TQPushButton("...", this); - m_selectButton->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding); + m_selectButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding); l->addWidget(m_selectButton); setFocusWidget(m_selectButton); @@ -87,7 +87,7 @@ StringListEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r void StringListEdit::showEditor() { - KDialogBase dialog(this->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), + KDialogBase dialog(this->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false); KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(property()->caption()), &dialog, "editlist"); diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp index 53394d54f..1af1fcd18 100644 --- a/lib/koproperty/editors/symbolcombo.cpp +++ b/lib/koproperty/editors/symbolcombo.cpp @@ -41,12 +41,12 @@ SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name) m_edit = new TQLineEdit(this); m_edit->setLineWidth(0); m_edit->setReadOnly(true); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); m_edit->setMaxLength(1); l->addWidget(m_edit); m_select = new TQPushButton("...", this); - m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_select->setMinimumHeight(5); l->addWidget(m_select); @@ -90,7 +90,7 @@ SymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, c void SymbolCombo::selectChar() { - KDialogBase dialog(this->tqtopLevelWidget(), "charselect_dialog", true, i18n("Select Char"), + KDialogBase dialog(this->topLevelWidget(), "charselect_dialog", true, i18n("Select Char"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false); KCharSelect *select = new KCharSelect(&dialog, "select_char"); diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp index 674d2c89c..f89530ea1 100644 --- a/lib/koproperty/editors/timeedit.cpp +++ b/lib/koproperty/editors/timeedit.cpp @@ -38,7 +38,7 @@ TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQTimeEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp index 8c150de20..426fe0bd3 100644 --- a/lib/koproperty/editors/urledit.cpp +++ b/lib/koproperty/editors/urledit.cpp @@ -36,14 +36,14 @@ URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KURLRequester(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); setProperty(property); connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&))); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } URLEdit::~URLEdit() diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index df0ec956e..c026aad04 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -65,10 +65,10 @@ Test::Test() m_set->addProperty(new Property("Bool", TQVariant(true, 4), "Bool"), group); m_set->addProperty(p = new Property("3 States", TQVariant(), "3 States", "", Boolean), group); p->setOption("3rdState", "None"); - m_set->addProperty(p = new Property("Date", TQDate::tqcurrentDate(),"Date"), group); + m_set->addProperty(p = new Property("Date", TQDate::currentDate(),"Date"), group); p->setIcon("date"); m_set->addProperty(new Property("Time", TQTime::currentTime(),"Time"), group); - m_set->addProperty(new Property("DateTime", TQDateTime::tqcurrentDateTime(),"Date/Time"), group); + m_set->addProperty(new Property("DateTime", TQDateTime::currentDateTime(),"Date/Time"), group); TQStringList list;//keys list << "myitem" << "otheritem" << "3rditem"; @@ -107,7 +107,7 @@ Test::Test() p->setIcon("fonts"); m_set->addProperty(new Property("Cursor", TQCursor(TQt::WaitCursor),"Cursor"), group); m_set->addProperty(new Property("LineStyle", 3, "Line Style", "", LineStyle), group); - m_set->addProperty(new Property("SizePolicy", tqsizePolicy(), "Size Policy"), group); + m_set->addProperty(new Property("SizePolicy", sizePolicy(), "Size Policy"), group); // kdDebug() << m_set->groupNames() << endl; diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp index b0169a963..3d6153ae4 100644 --- a/lib/koproperty/widget.cpp +++ b/lib/koproperty/widget.cpp @@ -192,7 +192,7 @@ Widget::setEditor(TQWidget* editor) d->editor = editor; if (!d->editor) return; - d->editor->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + d->editor->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); d->editor->move(0,0); } diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index c93807a33..49749f91d 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -147,7 +147,7 @@ void DateFormatWidget::updateLabel() { KoVariableDateFormat format; format.setFormatProperties( resultString() ); - TQDateTime ct = TQDateTime::tqcurrentDateTime().addDays( correctValue() ); + TQDateTime ct = TQDateTime::currentDateTime().addDays( correctValue() ); label->setText( format.convert( ct ) ); } diff --git a/lib/kotext/IsoDuration.h b/lib/kotext/IsoDuration.h index 6ccb28913..c0f8fd6f0 100644 --- a/lib/kotext/IsoDuration.h +++ b/lib/kotext/IsoDuration.h @@ -31,7 +31,7 @@ static TQString minutesToISODuration( int mn ) { bool neg = mn < 0; // PT == period of time - see ISO8601 - TQString str = TQString::tqfromLatin1( "PT00H%1M00S" ).tqarg( TQABS( mn ) ); + TQString str = TQString::fromLatin1( "PT00H%1M00S" ).tqarg( TQABS( mn ) ); if ( neg ) str.prepend( '-' ); return str; @@ -41,7 +41,7 @@ static TQString daysToISODuration( int days ) { bool neg = days < 0; // P == period, time is ommitted - see ISO8601 - TQString str = TQString::tqfromLatin1( "P%1D" ).tqarg( TQABS( days ) ); + TQString str = TQString::fromLatin1( "P%1D" ).tqarg( TQABS( days ) ); if ( neg ) str.prepend( '-' ); return str; diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index beaeb9f95..edefb8e56 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -69,7 +69,7 @@ static int minimumListWidth( const TQListBox *list ) } if( w == 0 ) { w = 40; } w += list->frameWidth() * 2; - w += list->verticalScrollBar()->tqsizeHint().width(); + w += list->verticalScrollBar()->sizeHint().width(); return w; } @@ -297,7 +297,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, sampleEdit->setFont(tmpFont); sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() ); - sampleEdit->tqsetAlignment(TQt::AlignCenter); + sampleEdit->setAlignment(TQt::AlignCenter); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); TQString sampleEditWhatsThisText = i18n("This sample text illustrates the current settings. " @@ -333,8 +333,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, setSizeIsRelative( *sizeIsRelativeState ); KConfig *config = KGlobal::config(); - KConfigGroupSaver saver(config, TQString::tqfromLatin1("General")); - showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false)); + KConfigGroupSaver saver(config, TQString::fromLatin1("General")); + showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } KFontChooser_local::~KFontChooser_local() @@ -405,9 +405,9 @@ TQButton::ToggleState KFontChooser_local::sizeIsRelative() const : TQButton::NoChange; } -TQSize KFontChooser_local::tqsizeHint( void ) const +TQSize KFontChooser_local::sizeHint( void ) const { - return tqminimumSizeHint(); + return minimumSizeHint(); } @@ -539,7 +539,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style) fillSizeList(); } else { // is bitmap font. //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO - TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); + TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); if(sizes.count() > 0) { TQValueList<int>::iterator it; diff=1000; @@ -694,13 +694,13 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) if ( !ptr ) return; - TQString font = TQString::tqfromLatin1(ptr + 1); + TQString font = TQString::fromLatin1(ptr + 1); int pos; if ( ( pos = font.find( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) + if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/KFontDialog_local.h index b9d4853c8..943ce7242 100644 --- a/lib/kotext/KFontDialog_local.h +++ b/lib/kotext/KFontDialog_local.h @@ -263,7 +263,7 @@ public: /** * Reimplemented for internal reasons. */ - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; signals: /** diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index c859d26c5..f2c88bcc7 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -932,7 +932,7 @@ bool KoAutoFormat::doCompletion( KoTextCursor* textEditCursor, KoTextParag *para uint maxlength = 0; for ( TQStringList::ConstIterator it = wordlist.begin(); it != wordlist.end(); ++it ) // several completion words were found { - if ( (*it).tqstartsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord + if ( (*it).startsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord { if ( (*it).length() > maxlength ) maxlength = (*it).length(); @@ -1063,7 +1063,7 @@ void KoAutoFormat::showToolTipBox(KoTextParag *parag, int index, TQWidget *widg m_completionBox->setText(word); m_completionBox->setLastWord(lastWord); m_completionBox->adjustSize(); - int const height = m_completionBox->tqsizeHint().height(); + int const height = m_completionBox->sizeHint().height(); m_completionBox->move( show_pos.x(), show_pos.y() - height ); if (!m_completionBox->isShown() ) diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index e6dce371e..ddcfb1ae6 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -331,11 +331,11 @@ void KoAutoFormatDia::setupTab1() hbox->addSpacing( 20 ); hbox->setSpacing(KDialog::spacingHint()); pbBulletStyle = new TQPushButton( tab1 ); - pbBulletStyle->setFixedSize( pbBulletStyle->tqsizeHint() ); + pbBulletStyle->setFixedSize( pbBulletStyle->sizeHint() ); hbox->addWidget( pbBulletStyle ); pbDefaultBulletStyle = new TQPushButton( tab1 ); pbDefaultBulletStyle->setText(i18n("Default")); - pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->tqsizeHint() ); + pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->sizeHint() ); hbox->addWidget( pbDefaultBulletStyle ); hbox->addStretch( 1 ); @@ -393,10 +393,10 @@ void KoAutoFormatDia::setupTab2() hbox->addSpacing( 20 ); pbDoubleQuote1 = new TQPushButton( tab2 ); - pbDoubleQuote1->setFixedSize( pbDoubleQuote1->tqsizeHint() ); + pbDoubleQuote1->setFixedSize( pbDoubleQuote1->sizeHint() ); pbDoubleQuote2 = new TQPushButton( tab2 ); - pbDoubleQuote2->setFixedSize( pbDoubleQuote2->tqsizeHint() ); + pbDoubleQuote2->setFixedSize( pbDoubleQuote2->sizeHint() ); if (TQApplication::reverseLayout()) { hbox->addWidget( pbDoubleQuote2 ); @@ -410,7 +410,7 @@ void KoAutoFormatDia::setupTab2() pbDoubleDefault = new TQPushButton( tab2 ); pbDoubleDefault->setText(i18n("Default")); - pbDoubleDefault->setFixedSize( pbDoubleDefault->tqsizeHint() ); + pbDoubleDefault->setFixedSize( pbDoubleDefault->sizeHint() ); hbox->addWidget( pbDoubleDefault ); hbox->addStretch( 1 ); @@ -434,10 +434,10 @@ void KoAutoFormatDia::setupTab2() hbox->addSpacing( 20 ); pbSimpleQuote1 = new TQPushButton( tab2 ); - pbSimpleQuote1->setFixedSize( pbSimpleQuote1->tqsizeHint() ); + pbSimpleQuote1->setFixedSize( pbSimpleQuote1->sizeHint() ); pbSimpleQuote2 = new TQPushButton( tab2 ); - pbSimpleQuote2->setFixedSize( pbSimpleQuote2->tqsizeHint() ); + pbSimpleQuote2->setFixedSize( pbSimpleQuote2->sizeHint() ); if (TQApplication::reverseLayout()) { hbox->addWidget( pbSimpleQuote2 ); @@ -451,7 +451,7 @@ void KoAutoFormatDia::setupTab2() pbSimpleDefault = new TQPushButton( tab2 ); pbSimpleDefault->setText(i18n("Default")); - pbSimpleDefault->setFixedSize( pbSimpleDefault->tqsizeHint() ); + pbSimpleDefault->setFixedSize( pbSimpleDefault->sizeHint() ); hbox->addWidget( pbSimpleDefault ); hbox->addStretch( 1 ); diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index a6c8b2bbb..be5278e18 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -64,7 +64,7 @@ TQString KoCommentDia::commentText() void KoCommentDia::slotAddAuthorName() { - TQString date = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ); + TQString date = KGlobal::locale()->formatDate( TQDate::currentDate() ); TQString time = KGlobal::locale()->formatTime( TQTime::currentTime() ); TQString result = TQString("--------%1 ,%2, %3------\n").tqarg(authorName).tqarg(date).tqarg(time); m_multiLine->insertLine( result, m_multiLine->numLines() ); diff --git a/lib/kotext/KoCompletionBase.ui b/lib/kotext/KoCompletionBase.ui index 12ae9d5d3..3156e0785 100644 --- a/lib/kotext/KoCompletionBase.ui +++ b/lib/kotext/KoCompletionBase.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -289,7 +289,7 @@ This option is most important when Automatically add words to completion list is <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> @@ -329,7 +329,7 @@ This option is most important when Automatically add words to completion list is <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 66d8d374a..abe89b567 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -57,7 +57,7 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl m_autoFormat( *autoFormat ), m_docAutoFormat( autoFormat ) { - connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtontqStatus())); + connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtonStatus())); TQStringList lst; lst << i18n( "Enter" ); lst << i18n( "Tab" ); @@ -74,10 +74,10 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl connect( pbSaveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveCompletionEntry())); slotResetConf(); // aka load config - changeButtontqStatus(); + changeButtonStatus(); } -void KoCompletion::changeButtontqStatus() { +void KoCompletion::changeButtonStatus() { bool state = cbAllowCompletion->isChecked(); completionBox->setEnabled( state); @@ -122,7 +122,7 @@ void KoCompletion::slotResetConf() { default: m_completionKeyAction->setCurrentItem( 0 ); } - changeButtontqStatus(); + changeButtonStatus(); } void KoCompletion::slotAddCompletionEntry() { diff --git a/lib/kotext/KoCompletionDia.h b/lib/kotext/KoCompletionDia.h index 1aefb39ab..98927e0b9 100644 --- a/lib/kotext/KoCompletionDia.h +++ b/lib/kotext/KoCompletionDia.h @@ -35,7 +35,7 @@ public: void saveSettings(); protected slots: - void changeButtontqStatus(); + void changeButtonStatus(); void slotResetConf(); void slotAddCompletionEntry(); void slotRemoveCompletionEntry(); diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp index 54599d075..981ec5061 100644 --- a/lib/kotext/KoComplexText.cpp +++ b/lib/kotext/KoComplexText.cpp @@ -913,7 +913,7 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co } } - KoBiditqStatus status = control->status; + KoBidiStatus status = control->status; TQChar::Direction dir = TQChar::DirON; int sor = start; diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h index 72abfbed4..7f75d7300 100644 --- a/lib/kotext/KoComplexText.h +++ b/lib/kotext/KoComplexText.h @@ -62,8 +62,8 @@ #ifndef TQT_NO_COMPLEXTEXT // bidi helper classes. Internal to TQt -struct TQ_EXPORT KoBiditqStatus { - KoBiditqStatus() { +struct TQ_EXPORT KoBidiStatus { + KoBidiStatus() { eor = TQChar::DirON; lastStrong = TQChar::DirON; last = TQChar:: DirON; @@ -87,12 +87,12 @@ struct TQ_EXPORT KoBidiContext : public TQShared { struct TQ_EXPORT KoBidiControl { KoBidiControl() { context = 0; } - KoBidiControl( KoBidiContext *c, KoBiditqStatus s) + KoBidiControl( KoBidiContext *c, KoBidiStatus s) { context = c; if( context ) context->ref(); status = s; } ~KoBidiControl() { if ( context && context->deref() ) delete context; } void setContext( KoBidiContext *c ) { if ( context == c ) return; if ( context && context->deref() ) delete context; context = c; context->ref(); } KoBidiContext *context; - KoBiditqStatus status; + KoBidiStatus status; }; struct TQ_EXPORT KoTextRun { diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index e4b9f339e..fb7d9b9d8 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -33,7 +33,7 @@ KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent TQVBox *page = makeVBoxMainWidget(); new TQLabel(i18n("Please specify a new style name:"), page); m_styleName = new TQLineEdit( page ); - m_styleName->setMinimumWidth( m_styleName->tqsizeHint().width() * 3 ); + m_styleName->setMinimumWidth( m_styleName->sizeHint().width() * 3 ); connect( m_styleName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &))); m_styleName->setFocus(); diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index aa74d133f..f3b841212 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -67,7 +67,7 @@ void KoVariableNameDia::init() row1->setSpacing( KDialog::spacingHint() ); TQLabel *l = new TQLabel( i18n( "Name:" ), row1 ); - l->setFixedSize( l->tqsizeHint() ); + l->setFixedSize( l->sizeHint() ); names = new TQComboBox( TRUE, row1 ); names->setFocus(); @@ -108,9 +108,9 @@ void KoCustomVariablesListItem::setup() { TQListViewItem::setup(); setHeight( TQMAX( listView()->fontMetrics().height(), - editWidget->tqsizeHint().height() ) ); - //if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() ) - // listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() ); + editWidget->sizeHint().height() ) ); + //if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() ) + // listView()->setColumnWidth( 1, editWidget->sizeHint().width() ); } void KoCustomVariablesListItem::update() @@ -297,13 +297,13 @@ void KoCustomVarDialog::init() TQHBox *row1 = new TQHBox( back ); row1->setSpacing( KDialog::spacingHint() ); TQLabel *ln = new TQLabel( i18n( "Name:" ), row1 ); - ln->setFixedSize( ln->tqsizeHint() ); + ln->setFixedSize( ln->sizeHint() ); m_name = new KLineEdit( row1 ); TQHBox *row2 = new TQHBox( back ); row2->setSpacing( KDialog::spacingHint() ); TQLabel *lv = new TQLabel( i18n( "Value:" ), row2 ); - lv->setFixedSize( lv->tqsizeHint() ); + lv->setFixedSize( lv->sizeHint() ); m_value = new KLineEdit( row2 ); } diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp index 6126d6c5a..0de6ee87d 100644 --- a/lib/kotext/KoParagCounter.cpp +++ b/lib/kotext/KoParagCounter.cpp @@ -575,7 +575,7 @@ void KoParagCounter::setDisplayLevels( int l ) tqinvalidate(); } -void KoParagCounter::tqsetAlignment( int a ) +void KoParagCounter::setAlignment( int a ) { m_align = a; tqinvalidate(); @@ -839,7 +839,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"}; TQString KoParagCounter::makeRomanNumber( int n ) { if ( n >= 0 ) - return TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] + + return TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] + RNHundreds[ ( n / 100 ) % 10 ] + RNTens[ ( n / 10 ) % 10 ] + RNUnits[ ( n ) % 10 ] ); diff --git a/lib/kotext/KoParagCounter.h b/lib/kotext/KoParagCounter.h index dbedb3e85..6758d952f 100644 --- a/lib/kotext/KoParagCounter.h +++ b/lib/kotext/KoParagCounter.h @@ -175,7 +175,7 @@ public: /** Counter tqalignment */ int tqalignment() const; - void tqsetAlignment( int a ); + void setAlignment( int a ); /** * Return the format to use for the counter. diff --git a/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui index 4c93c261f..131e1b0c1 100644 --- a/lib/kotext/KoParagDecorationTab.ui +++ b/lib/kotext/KoParagDecorationTab.ui @@ -131,7 +131,7 @@ modified in the preview.</p></string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> @@ -361,7 +361,7 @@ regardless of the style of the preceeding and subsequent paragraphs.</p></ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>250</width> <height>21</height> diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 2bc0262df..13c483507 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -205,7 +205,7 @@ void KoCounterStyleWidget::alignmentChanged(const TQString& s) kdError()<<"Not Implemented"<<endl; return; } - m_counter.tqsetAlignment(a); + m_counter.setAlignment(a); emit sig_alignmentChanged(a); } @@ -890,12 +890,12 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW TQLabel * lLimit = new TQLabel(length , indentFrame ); if(frameWidth!=-1) { - lLimit->tqsetAlignment( AlignRight ); + lLimit->setAlignment( AlignRight ); indentGrid->addWidget( lLimit, 1,0 ); } TQLabel * lLeft = new TQLabel( i18n("&Left:"), indentFrame ); - lLeft->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lLeft->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); indentGrid->addWidget( lLeft, 1, 0 ); eLeft = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); @@ -904,7 +904,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW connect( eLeft, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( leftChanged( double ) ) ); TQLabel * lRight = new TQLabel( i18n("&Right:"), indentFrame ); - lRight->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lRight->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); indentGrid->addWidget( lRight, 2, 0 ); eRight = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); @@ -913,7 +913,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW connect( eRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) ); TQLabel * lFirstLine = new TQLabel( i18n("&First line:"), indentFrame ); - lFirstLine->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lFirstLine->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); indentGrid->addWidget( lFirstLine, 3, 0 ); eFirstLine = new KoUnitDoubleSpinBox( indentFrame, -9999, 9999, 1, 0.0, m_unit ); @@ -974,7 +974,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW KDialog::marginHint(), KDialog::spacingHint() ); TQLabel * lBefore = new TQLabel( i18n("Before:"), pSpaceFrame ); - lBefore->tqsetAlignment( AlignRight ); + lBefore->setAlignment( AlignRight ); pSpaceGrid->addWidget( lBefore, 1, 0 ); eBefore = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, CM_TO_POINT(1), 0.0, m_unit ); @@ -983,7 +983,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW pSpaceGrid->addWidget( eBefore, 1, 1 ); TQLabel * lAfter = new TQLabel( i18n("After:"), pSpaceFrame ); - lAfter->tqsetAlignment( AlignRight ); + lAfter->setAlignment( AlignRight ); pSpaceGrid->addWidget( lAfter, 2, 0 ); eAfter = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, 1, 0.0, m_unit ); @@ -1608,7 +1608,7 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, gNumbering->tqlayout()->setSpacing( 0 ); gNumbering->tqlayout()->setMargin( 0 ); TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->tqlayout() ); - numberingGroupLayout->tqsetAlignment( TQt::AlignTop ); + numberingGroupLayout->setAlignment( TQt::AlignTop ); numberingGroupLayout->setSpacing( KDialog::spacingHint() ); numberingGroupLayout->setMargin( KDialog::marginHint() ); @@ -1773,7 +1773,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram gPosition->tqlayout()->setSpacing( 0 ); gPosition->tqlayout()->setMargin( 0 ); TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->tqlayout() ); - GroupBox2Layout->tqsetAlignment( TQt::AlignTop ); + GroupBox2Layout->setAlignment( TQt::AlignTop ); GroupBox2Layout->setSpacing( KDialog::spacingHint() ); GroupBox2Layout->setMargin( KDialog::marginHint() ); @@ -1801,7 +1801,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram bgAlign->tqlayout()->setSpacing( 0 ); bgAlign->tqlayout()->setMargin( 0 ); TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->tqlayout() ); - ButtonGroup1Layout->tqsetAlignment( TQt::AlignTop ); + ButtonGroup1Layout->setAlignment( TQt::AlignTop ); ButtonGroup1Layout->setSpacing( KDialog::spacingHint() ); ButtonGroup1Layout->setMargin( KDialog::marginHint() ); @@ -1837,7 +1837,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram gTabLeader = new TQGroupBox( this, "gTabLeader" ); gTabLeader->setTitle( i18n( "Tab Leader" ) ); TQVBoxLayout* GroupBox5Layout = new TQVBoxLayout( gTabLeader ); - GroupBox5Layout->tqsetAlignment( TQt::AlignTop ); + GroupBox5Layout->setAlignment( TQt::AlignTop ); GroupBox5Layout->setSpacing( KDialog::spacingHint() ); GroupBox5Layout->setMargin( KDialog::marginHint() ); GroupBox5Layout->addSpacing( fontMetrics().height() / 2 ); // groupbox title @@ -1850,7 +1850,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram TQLabel* TextLabel2 = new TQLabel( gTabLeader); TextLabel2->setText( i18n( "&Filling:" ) ); - TextLabel2->tqsetAlignment( AlignRight ); + TextLabel2->setAlignment( AlignRight ); fillingGrid->addWidget( TextLabel2, 0, 0 ); cFilling = new TQComboBox( FALSE, gTabLeader); @@ -1864,7 +1864,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram fillingGrid->addWidget( cFilling, 0, 1 ); TQLabel * TextLabel3 = new TQLabel( i18n("&Width:"), gTabLeader ); - TextLabel3->tqsetAlignment( AlignRight ); + TextLabel3->setAlignment( AlignRight ); fillingGrid->addWidget( TextLabel3, 1, 0 ); eWidth = new KoUnitDoubleSpinBox( gTabLeader ); diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h index c4bbed925..26f68e0bd 100644 --- a/lib/kotext/KoParagDia.h +++ b/lib/kotext/KoParagDia.h @@ -369,7 +369,7 @@ protected slots: void restartChanged(bool b) {m_counter.setRestartCounter(b); } void depthChanged(int i) {m_counter.setDepth(i); updatePreview();} void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i); updatePreview();} - void alignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();} + void alignmentChanged(int i) {m_counter.setAlignment(i); updatePreview();} void slotChangeCustomBullet( const TQString & f, TQChar c); void styleChanged (KoParagCounter::Style st ); diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index 42e8d2b0d..374184b3e 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -310,7 +310,7 @@ KoTextCursor *KoTextAlignmentCommand::execute( KoTextCursor *c ) if ( !p ) return c; while ( p ) { - p->tqsetAlignment( newAlign ); + p->setAlignment( newAlign ); if ( p->paragId() == lastParag ) break; p = p->next(); @@ -326,7 +326,7 @@ KoTextCursor *KoTextAlignmentCommand::unexecute( KoTextCursor *c ) int i = 0; while ( p ) { if ( i < (int)oldAligns.size() ) - p->tqsetAlignment( oldAligns.at( i ) ); + p->setAlignment( oldAligns.at( i ) ); if ( p->paragId() == lastParag ) break; p = p->next(); diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h index 44c360d5b..a5fd6b1ad 100644 --- a/lib/kotext/KoRichText.h +++ b/lib/kotext/KoRichText.h @@ -477,9 +477,9 @@ public: KoTextTableCell( KoTextTable* table, int row, int column ); virtual ~KoTextTableCell(); - TQSize tqsizeHint() const ; - TQSize tqminimumSize() const ; - TQSize tqmaximumSize() const ; + TQSize sizeHint() const ; + TQSize minimumSize() const ; + TQSize maximumSize() const ; TQSizePolicy::ExpandData expanding() const; bool isEmpty() const; void setGeometry( const TQRect& ) ; @@ -564,8 +564,8 @@ public: TQString richText() const; - int minimumWidth() const { return tqlayout ? tqlayout->tqminimumSize().width() : 0; } - int widthHint() const { return ( tqlayout ? tqlayout->tqsizeHint().width() : 0 ) + 2 * outerborder; } + int minimumWidth() const { return tqlayout ? tqlayout->minimumSize().width() : 0; } + int widthHint() const { return ( tqlayout ? tqlayout->sizeHint().width() : 0 ) + 2 * outerborder; } TQPtrList<KoTextTableCell> tableCells() const { return cells; } @@ -697,7 +697,7 @@ struct KoTextParagLineStart #endif { } #ifndef TQT_NO_COMPLEXTEXT - KoTextParagLineStart( KoBidiContext *c, KoBiditqStatus s ) : y(0), baseLine(0), h(0), + KoTextParagLineStart( KoBidiContext *c, KoBidiStatus s ) : y(0), baseLine(0), h(0), lineSpacing( 0 ), hyphenated( false ), status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref(); } #endif @@ -728,7 +728,7 @@ public: short lineSpacing; bool hyphenated; #ifndef TQT_NO_COMPLEXTEXT - KoBiditqStatus status; + KoBidiStatus status; #endif int w; diff --git a/lib/kotext/KoStyleCollection.h b/lib/kotext/KoStyleCollection.h index 66a244e5c..811bbaea5 100644 --- a/lib/kotext/KoStyleCollection.h +++ b/lib/kotext/KoStyleCollection.h @@ -68,7 +68,7 @@ public: * Overloaded for convenience. */ KoParagStyle* findStyle( const TQString & name ) const { - return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::tqfromLatin1( "Standard" ) ) ); + return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::fromLatin1( "Standard" ) ) ); } /** diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index e5a7dbfa2..19840621e 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -185,15 +185,15 @@ void KoStyleManager::addGeneralTab( int flags ) { tabLayout->setMargin( KDialog::marginHint() ); m_nameString = new TQLineEdit( tab ); - m_nameString->resize(m_nameString->tqsizeHint() ); + m_nameString->resize(m_nameString->sizeHint() ); connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); TQLabel *nameLabel = new TQLabel( tab ); nameLabel->setText( i18n( "Name:" ) ); - nameLabel->resize(nameLabel->tqsizeHint()); - nameLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nameLabel->resize(nameLabel->sizeHint()); + nameLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( nameLabel, 0, 0 ); @@ -203,7 +203,7 @@ void KoStyleManager::addGeneralTab( int flags ) { TQLabel *nextStyleLabel = new TQLabel( tab ); nextStyleLabel->setText( i18n( "Next style:" ) ); - nextStyleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nextStyleLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( nextStyleLabel, 1, 0 ); @@ -212,7 +212,7 @@ void KoStyleManager::addGeneralTab( int flags ) { TQLabel *inheritStyleLabel = new TQLabel( tab ); inheritStyleLabel->setText( i18n( "Inherit style:" ) ); - inheritStyleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + inheritStyleLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( inheritStyleLabel, 2, 0 ); diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index b3f24708a..126568ef3 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -155,11 +155,11 @@ int KoTextDocument::widthUsed() const int w = 0; while ( p ) { int a = p->tqalignment(); - p->tqsetAlignment( TQt::AlignLeft ); + p->setAlignment( TQt::AlignLeft ); p->tqinvalidate( 0 ); p->format(); w = TQMAX( w, p->rect().width() ); - p->tqsetAlignment( a ); + p->setAlignment( a ); p->tqinvalidate( 0 ); p = p->next(); } @@ -1295,7 +1295,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, // The test on mat is almost like isIdentity(), but allows for translation. //// ##### The way to fix this: initialize the pixmap to be fully transparent instead // of being white. - TQWMatrix mat = p->tqworldMatrix(); + TQWMatrix mat = p->worldMatrix(); if ( ( mat.m11() != 1.0 || mat.m22() != 1.0 || mat.m12() != 0.0 || mat.m21() != 0.0 ) && brush.style() != TQt::SolidPattern ) useDoubleBuffer = FALSE; diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h index 8cdc1b524..5f2a0665a 100644 --- a/lib/kotext/KoTextDocument.h +++ b/lib/kotext/KoTextDocument.h @@ -190,7 +190,7 @@ public: //bool focusNextPrevChild( bool next ); int tqalignment() const; - void tqsetAlignment( int a ); + void setAlignment( int a ); int *tabArray() const; int tabStopWidth() const; @@ -540,7 +540,7 @@ inline int KoTextDocument::tqalignment() const return align; } -inline void KoTextDocument::tqsetAlignment( int a ) +inline void KoTextDocument::setAlignment( int a ) { align = a; } diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 30bf6dd35..8732d71d5 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -748,7 +748,7 @@ void KoTextObject::pasteText( KoTextCursor * cursor, const TQString & text, KoTe kdDebug(32500) << "KoTextObject::pasteText cursor parag=" << cursor->parag()->paragId() << endl; TQString t = text; // Need to convert CRLF to NL - TQRegExp crlf( TQString::tqfromLatin1("\r\n") ); + TQRegExp crlf( TQString::fromLatin1("\r\n") ); t.replace( crlf, TQChar('\n') ); // Convert non-printable chars for ( int i=0; (uint) i<t.length(); i++ ) { diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index 23754c285..a081dfda8 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -961,7 +961,7 @@ void KoTextParag::setAlign( int align ) { Q_ASSERT( align <= TQt::AlignJustify ); align &= TQt::AlignHorizontal_Mask; - tqsetAlignment( align ); + setAlignment( align ); m_layout.tqalignment = align; } diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index e27a9afc5..591242a28 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -130,8 +130,8 @@ public: void setFormat( int index, int len, const KoTextFormat *f, bool useCollection = TRUE, int flags = -1 ); - void tqsetAlignment( uint a ); - void tqsetAlignmentDirect( uint a ) { align = a; } + void setAlignment( uint a ); + void setAlignmentDirect( uint a ) { align = a; } uint tqalignment() const; virtual void paint( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections, @@ -235,7 +235,7 @@ public: void setLineSpacingType( KoParagLayout::SpacingType _type ); - /** Use this to change the paragraph tqalignment, not KoTextParag::tqsetAlignment ! */ + /** Use this to change the paragraph tqalignment, not KoTextParag::setAlignment ! */ void setAlign( int align ); /** Return the real tqalignment: Auto is resolved to either Left or Right */ int resolveAlignment() const; @@ -520,7 +520,7 @@ inline KoTextDocument *KoTextParag::document() const return doc; } -inline void KoTextParag::tqsetAlignment( uint a ) +inline void KoTextParag::setAlignment( uint a ) { if ( a == align ) return; diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 32e82b73c..e272422dc 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -901,7 +901,7 @@ bool KoTextView::insertParagraph(const TQPoint &pos) { //FIXME me bidi. //change parag tqalignment => right tqalignment - last->tqsetAlignment( TQt::AlignRight ); + last->setAlignment( TQt::AlignRight ); } else { @@ -1500,7 +1500,7 @@ void KoTextView::updateStyleFromSelection( KoParagStyle* style ) void KoTextView::addBookmarks(const TQString &url) { - TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") ); + TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") ); KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,false ); KBookmarkGroup group = bookManager->root(); group.addBookmark( bookManager, url, KURL( url)); diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index fa1b03feb..4b744faf7 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -1211,7 +1211,7 @@ void KoDateVariable::resize() void KoDateVariable::recalc() { if ( m_subtype == VST_DATE_CURRENT ) - m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate)); + m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate)); else if ( m_subtype == VST_DATE_LAST_PRINTING ) m_varValue = m_varColl->variableSetting()->lastPrintingDate(); else if ( m_subtype == VST_DATE_CREATE_FILE ) @@ -1222,7 +1222,7 @@ void KoDateVariable::recalc() { // Only if never set before (i.e. upon insertion) if ( m_varValue.isNull() ) - m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate)); + m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate)); } resize(); } @@ -2505,7 +2505,7 @@ void KoLinkVariable::drawCustomItem( TQPainter* p, int x, int y, int wpix, int h /******************************************************************/ KoNoteVariable::KoNoteVariable( KoTextDocument *textdoc, const TQString & _note,KoVariableFormat *varFormat,KoVariableCollection *_varColl ) : KoVariable( textdoc, varFormat,_varColl ) - , m_createdNoteDate( TQDate::tqcurrentDate() ) + , m_createdNoteDate( TQDate::currentDate() ) { m_varValue = TQVariant( _note ); } diff --git a/lib/kotext/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui index cd8f17f2c..7c8896b5f 100644 --- a/lib/kotext/kodecorationtabbase.ui +++ b/lib/kotext/kodecorationtabbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQGroupBox"> <property name="name"> - <cstring>tqcolorGroupBox</cstring> + <cstring>colorGroupBox</cstring> </property> <property name="title"> <string>Colors</string> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -143,7 +143,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui index 27be07027..b2b4ce26a 100644 --- a/lib/kotext/kohighlightingtabbase.ui +++ b/lib/kotext/kohighlightingtabbase.ui @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui index a90735847..0fbd54420 100644 --- a/lib/kotext/kolanguagetabbase.ui +++ b/lib/kotext/kolanguagetabbase.ui @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>171</height> diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui index 471607d4d..e7e03d584 100644 --- a/lib/kotext/kolayouttabbase.ui +++ b/lib/kotext/kolayouttabbase.ui @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp index 5d5fbe5e1..356b01589 100644 --- a/lib/kotext/tests/kobordertest.cpp +++ b/lib/kotext/tests/kobordertest.cpp @@ -11,14 +11,14 @@ class MyWidget : public TQWidget public: MyWidget( KoZoomHandler* _zh, TQWidget* parent ) : TQWidget( parent ), m_zh(_zh) { - tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize tqsizeHint() const { + TQSize sizeHint() const { return TQSize( 150, 150 ); } - TQSize tqminimumSizeHint() const { - return tqsizeHint(); + TQSize minimumSizeHint() const { + return sizeHint(); } KoBorder m_leftBorder; diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp index b6138315b..a13adddbb 100644 --- a/lib/kotext/tests/kotextformattertest.cpp +++ b/lib/kotext/tests/kotextformattertest.cpp @@ -205,8 +205,8 @@ int main (int argc, char ** argv) KApplication app(argc, argv, "KoTextFormatter test"); // Don't let locale settings lead to different hyphenation output - KGlobal::locale()->setLanguage( TQString::tqfromLatin1( "en_US" ) ); - KGlobal::locale()->setCountry( TQString::tqfromLatin1( "C" ) ); + KGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) ); + KGlobal::locale()->setCountry( TQString::fromLatin1( "C" ) ); KoTextFormatterTest test; //test.speedTest(); diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui index 830b3bdb3..77a261ea5 100644 --- a/lib/kotext/timedateformatwidget.ui +++ b/lib/kotext/timedateformatwidget.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp index e3a8e54fc..86e868f57 100644 --- a/lib/kross/api/eventsignal.cpp +++ b/lib/kross/api/eventsignal.cpp @@ -54,7 +54,7 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> argumen if(n.startsWith("2")) // Remove prefix of SIGNAL-macros n.remove(0,1); - int signalid = m_sender->tqmetaObject()->findSignal(n.latin1(), false); + int signalid = m_sender->metaObject()->findSignal(n.latin1(), false); if(signalid < 0) throw new Exception(TQString("No such signal '%1'.").tqarg(n)); diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp index fd566d318..56616904d 100644 --- a/lib/kross/api/eventslot.cpp +++ b/lib/kross/api/eventslot.cpp @@ -54,7 +54,7 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) if(n.startsWith("1")) // Remove prefix of SLOT-macros n.remove(0,1); - int slotid = m_receiver->tqmetaObject()->findSlot(n.latin1(), false); + int slotid = m_receiver->metaObject()->findSlot(n.latin1(), false); if(slotid < 0) throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(n)) ); @@ -80,7 +80,7 @@ TQCString EventSlot::getSlot(const TQCString& signal) //TQStringList paramlist = TQStringList::split(",", params); TQCString slot = TQString("callback(" + params + ")").latin1(); //normalizeSignalSlot(); - TQMetaObject* mo = tqmetaObject(); + TQMetaObject* mo = metaObject(); int slotid = mo->findSlot(slot, false); if(slotid < 0) { krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").tqarg(signal).tqarg(slot) ); diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp index 243f05033..04736e2a7 100644 --- a/lib/kross/api/qtobject.cpp +++ b/lib/kross/api/qtobject.cpp @@ -42,13 +42,13 @@ QtObject::QtObject(TQObject* object, const TQString& name) // Walk through the signals and slots the TQObject has // and attach them as events to this QtObject. - TQStrList slotnames = m_object->tqmetaObject()->slotNames(false); + TQStrList slotnames = m_object->metaObject()->slotNames(false); for(char* c = slotnames.first(); c; c = slotnames.next()) { TQCString s = c; addChild(s, new EventSlot(s, object, s) ); } - TQStrList signalnames = m_object->tqmetaObject()->signalNames(false); + TQStrList signalnames = m_object->metaObject()->signalNames(false); for(char* c = signalnames.first(); c; c = signalnames.next()) { TQCString s = c; addChild(s, new EventSignal(s, object, s) ); @@ -129,13 +129,13 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments) Kross::Api::Object::Ptr QtObject::propertyNames(Kross::Api::List::Ptr) { return new Kross::Api::Variant( - TQStringList::fromStrList(m_object->tqmetaObject()->propertyNames(false))); + TQStringList::fromStrList(m_object->metaObject()->propertyNames(false))); } Kross::Api::Object::Ptr QtObject::hasProperty(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - m_object->tqmetaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false)); + m_object->metaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false)); } Kross::Api::Object::Ptr QtObject::getProperty(Kross::Api::List::Ptr args) @@ -158,13 +158,13 @@ Kross::Api::Object::Ptr QtObject::setProperty(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::slotNames(Kross::Api::List::Ptr) { return new Kross::Api::Variant( - TQStringList::fromStrList(m_object->tqmetaObject()->slotNames(false))); + TQStringList::fromStrList(m_object->metaObject()->slotNames(false))); } Kross::Api::Object::Ptr QtObject::hasSlot(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - bool(m_object->tqmetaObject()->slotNames(false).find( + bool(m_object->metaObject()->slotNames(false).find( Kross::Api::Variant::toString(args->item(0)).latin1() ) != -1)); } @@ -173,7 +173,7 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args) { //TODO just call the child event ?! TQString name = Kross::Api::Variant::toString(args->item(0)); - int slotid = m_object->tqmetaObject()->findSlot(name.latin1(), false); + int slotid = m_object->metaObject()->findSlot(name.latin1(), false); if(slotid < 0) throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(name)) ); @@ -187,13 +187,13 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::signalNames(Kross::Api::List::Ptr) { return new Kross::Api::Variant( - TQStringList::fromStrList(m_object->tqmetaObject()->signalNames(false))); + TQStringList::fromStrList(m_object->metaObject()->signalNames(false))); } Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - bool(m_object->tqmetaObject()->signalNames(false).find( + bool(m_object->metaObject()->signalNames(false).find( Kross::Api::Variant::toString(args->item(0)).latin1() ) != -1)); } @@ -201,7 +201,7 @@ Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::emitSignal(Kross::Api::List::Ptr args) { TQString name = Kross::Api::Variant::toString(args->item(0)); - int signalid = m_object->tqmetaObject()->findSignal(name.latin1(), false); + int signalid = m_object->metaObject()->findSignal(name.latin1(), false); if(signalid < 0) throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").tqarg(name)) ); m_object->qt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => TQUObject* diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index b3b29bda3..bce26d5c4 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -377,7 +377,7 @@ void ScriptGUIClient::showScriptManager() KDialogBase* dialog = new KDialogBase(d->parent, "", true, i18n("Scripts Manager"), KDialogBase::Close); WdgScriptsManager* wsm = new WdgScriptsManager(this, dialog); dialog->setMainWidget(wsm); - dialog->resize( TQSize(360, 320).expandedTo(dialog->tqminimumSizeHint()) ); + dialog->resize( TQSize(360, 320).expandedTo(dialog->minimumSizeHint()) ); dialog->show(); } diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 488b7409d..cb696c5a6 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -93,7 +93,7 @@ class ToolTip : public TQToolTip virtual void maybeTip(const TQPoint& p) { ListItem* item = dynamic_cast<ListItem*>( m_parent->itemAt(p) ); if(item) { - TQRect r( m_parent->tqitemRect(item) ); + TQRect r( m_parent->itemRect(item) ); if(r.isValid() && item->action()) { tip(r, TQString("<qt>%1</qt>").tqarg(item->action()->toolTip())); } diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui index 379fb2dbc..d04223a4e 100644 --- a/lib/kross/main/wdgscriptsmanagerbase.ui +++ b/lib/kross/main/wdgscriptsmanagerbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -66,7 +66,7 @@ <property name="name"> <cstring>btnExec</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -97,7 +97,7 @@ <property name="name"> <cstring>btnLoad</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -114,7 +114,7 @@ <property name="name"> <cstring>btnUnload</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -145,7 +145,7 @@ <property name="name"> <cstring>btnInstall</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -162,7 +162,7 @@ <property name="name"> <cstring>btnUninstall</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -193,7 +193,7 @@ <property name="name"> <cstring>btnNewStuff</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> diff --git a/lib/kwmf/kowmfpaint.cc b/lib/kwmf/kowmfpaint.cc index 97a6e0332..430672731 100644 --- a/lib/kwmf/kowmfpaint.cc +++ b/lib/kwmf/kowmfpaint.cc @@ -249,7 +249,7 @@ void KoWmfPaint::drawPolyline( const TQPointArray &pa ) { void KoWmfPaint::drawPolygon( const TQPointArray &pa, bool winding ) { - mPainter.tqdrawPolygon( pa, winding ); + mPainter.drawPolygon( pa, winding ); } @@ -276,7 +276,7 @@ void KoWmfPaint::drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding if ( mPainter.pen().style() != TQt::NoPen ) { mPainter.setBrush( TQt::NoBrush ); for ( pa = listPa.first() ; pa ; pa = listPa.next() ) { - mPainter.tqdrawPolygon( *pa, winding ); + mPainter.drawPolygon( *pa, winding ); } } diff --git a/lib/kwmf/qwmf.cc b/lib/kwmf/qwmf.cc index a7451b46b..e9cafee1d 100644 --- a/lib/kwmf/qwmf.cc +++ b/lib/kwmf/qwmf.cc @@ -482,7 +482,7 @@ void QWinMetaFile::polygon( long, short* parm ) TQPointArray* pa; pa = pointArray( parm[ 0 ], &parm[ 1 ] ); - mPainter.tqdrawPolygon( *pa, mWinding ); + mPainter.drawPolygon( *pa, mWinding ); } diff --git a/lib/store/KoStoreDrag.h b/lib/store/KoStoreDrag.h index cbd8c40de..e35709e79 100644 --- a/lib/store/KoStoreDrag.h +++ b/lib/store/KoStoreDrag.h @@ -27,7 +27,7 @@ * This allows to drag-n-drop and copy-paste complex koffice objects. * As per usual with dragobjects, an instance of KoStoreDrag must be * created on the "sending" side (dragging or copying). The "receiving" - * side (dropping or pasting) only uses provides()/canDecode() and tqencodedData(). + * side (dropping or pasting) only uses provides()/canDecode() and encodedData(). * * To create the data in memory, create a TQBuffer, * then KoStore::createStore( theBuffer, .... ), save the diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp index 9da8d2d8f..a27bfc41f 100644 --- a/lib/store/tests/storedroptest.cpp +++ b/lib/store/tests/storedroptest.cpp @@ -88,7 +88,7 @@ bool StoreDropTest::processMimeSource( TQMimeSource* ev ) formats += fmt; bool oasis = TQString( fmt ).startsWith( acceptMimeType ); if ( oasis || TQString( fmt ) == "application/x-kpresenter" ) { - TQByteArray data = ev->tqencodedData( fmt ); + TQByteArray data = ev->encodedData( fmt ); showZipContents( data, fmt, oasis ); return true; } diff --git a/lib/store/tests/xmlwritertest.cpp b/lib/store/tests/xmlwritertest.cpp index 28bd3b088..e4280cec1 100644 --- a/lib/store/tests/xmlwritertest.cpp +++ b/lib/store/tests/xmlwritertest.cpp @@ -14,7 +14,7 @@ void speedTest() TQString paragText = TQString::fromUtf8( "This is the text of the paragraph. I'm including a euro sign to test encoding issues: €" ); TQCString styleName = "Heading 1"; - TQFile out( TQString::tqfromLatin1( "out5.xml" ) ); + TQFile out( TQString::fromLatin1( "out5.xml" ) ); if ( out.open(IO_WriteOnly) ) { KoXmlWriter writer( &out ); @@ -78,7 +78,7 @@ int main( int argc, char** argv ) { TEST_BEGIN( 0, 0 ); writer.startElement( "p", false /*no indent*/ ); - writer.addTextSpan( TQString::tqfromLatin1( " \t\n foo " ) ); + writer.addTextSpan( TQString::fromLatin1( " \t\n foo " ) ); writer.endElement(); TEST_END( "textspan test", "<r>\n" " <p><text:s text:c=\"3\"/><text:tab/><text:line-break/> foo<text:s text:c=\"2\"/></p>\n" @@ -97,14 +97,14 @@ int main( int argc, char** argv ) { TEST_BEGIN( 0, 0 ); writer.startElement( "p", false /*no indent*/ ); writer.addProcessingInstruction( "opendocument foobar" ); - writer.addTextSpan( TQString::tqfromLatin1( "foo" ) ); + writer.addTextSpan( TQString::fromLatin1( "foo" ) ); writer.endElement(); TEST_END( "processinginstruction test", "<r>\n" " <p><?opendocument foobar?>foo</p>\n" "</r>\n" ); TEST_BEGIN( 0, 0 ); - writer.addManifestEntry( TQString::tqfromLatin1( "foo/bar/blah" ), TQString::tqfromLatin1( "mime/type" ) ); + writer.addManifestEntry( TQString::fromLatin1( "foo/bar/blah" ), TQString::fromLatin1( "mime/type" ) ); TEST_END( "addManifestEntry", "<r>\n <manifest:file-entry manifest:media-type=\"mime/type\" manifest:full-path=\"foo/bar/blah\"/>\n</r>\n" ); int sz = 15000; // must be more than KoXmlWriter::s_escapeBufferLen @@ -119,7 +119,7 @@ int main( int argc, char** argv ) { TQString longPath; for ( uint i = 0 ; i < 1000 ; ++i ) - longPath += TQString::tqfromLatin1( "M10 10L20 20 " ); + longPath += TQString::fromLatin1( "M10 10L20 20 " ); expected = "<r a=\""; expected += longPath.utf8() + "\"/>\n"; TEST_BEGIN( 0, 0 ); @@ -131,9 +131,9 @@ int main( int argc, char** argv ) { bool val = true; int num = 1; double numdouble = 5.0; - writer.addConfigItem( TQString::tqfromLatin1( "TestConfigBool" ), val ); - writer.addConfigItem( TQString::tqfromLatin1( "TestConfigInt" ), num ); - writer.addConfigItem( TQString::tqfromLatin1( "TestConfigDouble" ), numdouble ); + writer.addConfigItem( TQString::fromLatin1( "TestConfigBool" ), val ); + writer.addConfigItem( TQString::fromLatin1( "TestConfigInt" ), num ); + writer.addConfigItem( TQString::fromLatin1( "TestConfigDouble" ), numdouble ); TEST_END( "test config", "<r>\n" " <config:config-item config:name=\"TestConfigBool\" config:type=\"boolean\">true</config:config-item>\n" " <config:config-item config:name=\"TestConfigInt\" config:type=\"int\">1</config:config-item>\n" diff --git a/lib/store/tests/xmlwritertest.h b/lib/store/tests/xmlwritertest.h index cdafe8a55..12011c033 100644 --- a/lib/store/tests/xmlwritertest.h +++ b/lib/store/tests/xmlwritertest.h @@ -34,8 +34,8 @@ TQCString s2 = expectedFull; \ if ( s1.length() != s2.length() ) \ qDebug( "got length %d, expected %d", s1.length(), s2.length() ); \ - s1.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ - s2.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ + s1.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ + s2.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ qDebug( "%s", s1.data() ); \ qDebug( "Expected:\n%s", s2.data() ); \ return 1; /*exit*/ \ diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp index 2639301e3..29b129488 100644 --- a/tools/converter/koconverter.cpp +++ b/tools/converter/koconverter.cpp @@ -56,7 +56,7 @@ bool convert( const KURL & uIn, const TQString & /*inputFormat*/, const KURL & u manager->setBatchMode( batch ); TQCString mime( outputFormat.latin1() ); - KoFilter::ConversiontqStatus status = manager->exp0rt( uOut.path(), mime ); + KoFilter::ConversionStatus status = manager->exp0rt( uOut.path(), mime ); progressObj.slotProgress(-1); delete manager; @@ -123,7 +123,7 @@ int main( int argc, char **argv ) KMimeType::Ptr outputMimetype; if ( args->isSet("mimetype") ) { - TQString mime = TQString::tqfromLatin1( args->getOption("mimetype") ); + TQString mime = TQString::fromLatin1( args->getOption("mimetype") ); outputMimetype = KMimeType::mimeType( mime ); if ( outputMimetype->name() == KMimeType::defaultMimeType() ) { diff --git a/tools/spell/main.cc b/tools/spell/main.cc index db6e3fa11..4489aa4f5 100644 --- a/tools/spell/main.cc +++ b/tools/spell/main.cc @@ -81,7 +81,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat KConfig * config = instance()->config(); TQCString gn( "KSpell " ); gn += instance()->instanceName(); // for compat reasons, and to avoid finding the group in kdeglobals (hmm...) - TQString groupName = TQString::tqfromLatin1( gn ); + TQString groupName = TQString::fromLatin1( gn ); //kdDebug() << "Group: " << groupName << endl; if ( config->hasGroup( groupName ) ) { @@ -114,7 +114,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat #endif #if 0 //fixme // Call the spell checker - KSpell::spelltqStatus status=(KSpell::spelltqStatus)KSpell::modalCheck( buffer, &ksconfig ); + KSpell::spellStatus status=(KSpell::spellStatus)KSpell::modalCheck( buffer, &ksconfig ); if (status == KSpell::Error) { diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc index 573b907c5..33d87564c 100644 --- a/tools/thesaurus/main.cc +++ b/tools/thesaurus/main.cc @@ -97,11 +97,11 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &) row1->addWidget(m_edit, 1); row1->addWidget(m_search, 0); m_back = new TQToolButton(m_page); - m_back->setIconSet(BarIconSet(TQString::tqfromLatin1("back"))); + m_back->setIconSet(BarIconSet(TQString::fromLatin1("back"))); TQToolTip::add(m_back, i18n("Back")); row1->addWidget(m_back, 0); m_forward = new TQToolButton(m_page); - m_forward->setIconSet(BarIconSet(TQString::tqfromLatin1("forward"))); + m_forward->setIconSet(BarIconSet(TQString::fromLatin1("forward"))); TQToolTip::add(m_forward, i18n("Forward")); row1->addWidget(m_forward, 0); m_lang = new KPushButton(i18n("Change Language..."), m_page); |