diff options
Diffstat (limited to 'chalk/plugins')
119 files changed, 429 insertions, 429 deletions
diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cc index 8d3604974..0217b7e17 100644 --- a/chalk/plugins/filters/blur/kis_blur_filter.cc +++ b/chalk/plugins/filters/blur/kis_blur_filter.cc @@ -72,7 +72,7 @@ KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w) config->setProperty("halfHeight", wCTA->widget()->intHalfWidth->value() ); config->setProperty("rotate", wCTA->widget()->intAngle->value() ); config->setProperty("strength", wCTA->widget()->intStrength->value() ); - config->setProperty("shape", wCTA->widget()->cbShape->currentItem()); + config->setProperty("tqshape", wCTA->widget()->cbShape->currentItem()); } return config; } @@ -87,7 +87,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte if(!config) config = new KisFilterConfiguration(id().id(), 1); TQVariant value; - int shape = (config->getProperty("shape", value)) ? value.toInt() : 0; + int tqshape = (config->getProperty("tqshape", value)) ? value.toInt() : 0; uint halfWidth = (config->getProperty("halfWidth", value)) ? value.toUInt() : 5; uint width = 2 * halfWidth + 1; uint halfHeight = (config->getProperty("halfHeight", value)) ? value.toUInt() : 5; @@ -100,7 +100,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte KisAutobrushShape* kas; kdDebug() << width << " " << height << " " << hFade << " " << vFade << endl; - switch(shape) + switch(tqshape) { case 1: kas = new KisAutobrushRectShape(width, height , hFade, vFade); diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cc b/chalk/plugins/filters/blur/kis_wdg_blur.cc index b12e6b11a..dc836971f 100644 --- a/chalk/plugins/filters/blur/kis_wdg_blur.cc +++ b/chalk/plugins/filters/blur/kis_wdg_blur.cc @@ -20,7 +20,7 @@ #include "kis_wdg_blur.h" -#include <layout.h> +#include <tqlayout.h> #include <tqtoolbutton.h> #include <kcombobox.h> @@ -55,7 +55,7 @@ KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name void KisWdgBlur::setConfiguration(KisFilterConfiguration* config) { TQVariant value; - if (config->getProperty("shape", value)) + if (config->getProperty("tqshape", value)) { widget()->cbShape->setCurrentItem( value.toUInt() ); } diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui index 8cd89f636..3e381bbe5 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -49,7 +49,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -58,7 +58,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <grid> <property name="name"> @@ -76,13 +76,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>32767</height> diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc index 38d310078..4ae92469c 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.cc +++ b/chalk/plugins/filters/bumpmap/bumpmap.cc @@ -31,7 +31,7 @@ #include <vector> #include <tqpoint.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqbuttongroup.h> diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui index 2934623a8..513912eae 100644 --- a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui +++ b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui @@ -52,7 +52,7 @@ layer, the current layer will be used.</string> <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -66,7 +66,7 @@ layer, the current layer will be used.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -82,7 +82,7 @@ layer, the current layer will be used.</string> <property name="title"> <string>Settings</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignAuto</set> </property> <grid> diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h index 23c7e221e..abd1bb66c 100644 --- a/chalk/plugins/filters/cimg/CImg.h +++ b/chalk/plugins/filters/cimg/CImg.h @@ -3749,8 +3749,8 @@ namespace cimg_library { then this image is displayed in the current display window. \param list : The list of images to display. \param axe : The axe used to append the image for visualization. Can be 'x' (default),'y','z' or 'v'. - \param align : Defines the relative alignment of images when displaying images of different sizes. - Can be '\p c' (centered, which is the default), '\p p' (top alignment) and '\p n' (bottom aligment). + \param align : Defines the relative tqalignment of images when displaying images of different sizes. + Can be '\p c' (centered, which is the default), '\p p' (top tqalignment) and '\p n' (bottom aligment). \see CImg::get_append() **/ @@ -7772,7 +7772,7 @@ namespace cimg_library { //! Return a resized image. /** - \param src = Image giving the geometry of the resize. + \param src = Image giving the tqgeometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7788,7 +7788,7 @@ namespace cimg_library { //! Return a resized image. /** - \param disp = Display giving the geometry of the resize. + \param disp = Display giving the tqgeometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7830,7 +7830,7 @@ namespace cimg_library { //! Resize the image. /** - \param src = Image giving the geometry of the resize. + \param src = Image giving the tqgeometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7846,7 +7846,7 @@ namespace cimg_library { //! Resize the image /** - \param disp = Display giving the geometry of the resize. + \param disp = Display giving the tqgeometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -12881,7 +12881,7 @@ namespace cimg_library { \param sharpness = define the contour preservation. \param anisotropy = define the smoothing anisotropy. \param alpha = image pre-blurring (gaussian). - \param sigma = regularity of the tensor-valued geometry. + \param sigma = regularity of the tensor-valued tqgeometry. \param dl = spatial discretization. \param da = angular discretization. \param gauss_prec = precision of the gaussian function. @@ -17550,7 +17550,7 @@ namespace cimg_library { //! Return a single image which is the concatenation of all images of the current CImgl instance. /** \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A CImg<T> image corresponding to the concatenation is returned. **/ CImg<T> get_append(const char axe='x',const char align='c') const { @@ -17740,7 +17740,7 @@ namespace cimg_library { The function returns immediately. \param disp : reference to an existing CImgDisplay instance, where the current image list will be displayed. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A reference to the current CImgl instance is returned. **/ const CImgl& display(CImgDisplay& disp,const char axe='x',const char align='c') const { @@ -17755,7 +17755,7 @@ namespace cimg_library { The function returns when a key is pressed or the display window is closed by the user. \param title : specify the title of the opening display window. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \param min_size : specify the minimum size of the opening display window. Images having dimensions below this size will be upscaled. \param max_size : specify the maximum size of the opening display window. Images having dimensions above this @@ -17774,7 +17774,7 @@ namespace cimg_library { Images of the list are concatenated in a single temporarly image for visualization purposes. The function returns when a key is pressed or the display window is closed by the user. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \param min_size : specify the minimum size of the opening display window. Images having dimensions below this size will be upscaled. \param max_size : specify the maximum size of the opening display window. Images having dimensions above this diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cc index 9c3a7543d..665dfc098 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc +++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cc @@ -429,7 +429,7 @@ bool KisCImgFilter::prepare_inpaint() bool KisCImgFilter::prepare_resize() { - const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image geometry"); + const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image tqgeometry"); const bool anchor = true; //cimg_option("-anchor",true,"Anchor original pixels"); if (!geom) throw CImgArgumentException("You need to specify an output geomety (option -g)"); int w,h; get_geom(geom,w,h); @@ -445,7 +445,7 @@ bool KisCImgFilter::prepare_resize() bool KisCImgFilter::prepare_visuflow() { - const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output geometry"); + const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output tqgeometry"); //const char *file_i = (const char *)NULL; //cimg_option("-i",(const char*)NULL,"Input init image"); const bool normalize = false; //cimg_option("-norm",false,"Normalize input flow"); diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc index 46df5cc67..b65a435f9 100644 --- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc +++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc @@ -19,7 +19,7 @@ * * Ported from the CImg Gimp plugin by Victor Stinner and David Tschumperlé. */ -#include "layout.h" +#include "tqlayout.h" #include "tqcheckbox.h" #include "tqpushbutton.h" diff --git a/chalk/plugins/filters/cimg/wdg_cimg.ui b/chalk/plugins/filters/cimg/wdg_cimg.ui index 09d4e3236..397e52e6d 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp index 75635c8c1..5b03ad70d 100644 --- a/chalk/plugins/filters/colorify/KisWdgColorify.cpp +++ b/chalk/plugins/filters/colorify/KisWdgColorify.cpp @@ -21,7 +21,7 @@ #include "KisWdgColorify.h" #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqspinbox.h> #include <kcolorbutton.h> diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui index 90337f226..ad1c062e4 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -38,7 +38,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc index 14d4c26da..31b726bf0 100644 --- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc +++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc @@ -21,7 +21,7 @@ #include "kis_wdg_color_to_alpha.h" #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqspinbox.h> #include <kcolorbutton.h> diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui index 70ff3071a..525b221ca 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -38,7 +38,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc index c0fcee28f..a97f809bd 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc @@ -23,7 +23,7 @@ #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpixmap.h> #include <tqpainter.h> #include <tqlabel.h> @@ -98,7 +98,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s ) } n = n.nextSibling(); } - // If the adjustment was cached, it now has changed - invalidate it + // If the adjustment was cached, it now has changed - tqinvalidate it delete m_adjustment; m_adjustment = 0; } diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc index 8b6aa949e..928badedc 100644 --- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <layout.h> +#include <tqlayout.h> #include <tqpixmap.h> #include <tqpainter.h> #include <tqlabel.h> diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index 3382102cc..1e576f662 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -50,13 +50,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>20</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>250</width> <height>20</height> @@ -84,13 +84,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>254</width> <height>254</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>254</width> <height>254</height> @@ -116,13 +116,13 @@ <property name="name"> <cstring>kCurve</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>250</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>250</width> <height>250</height> @@ -143,13 +143,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>20</width> <height>250</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>250</height> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> @@ -193,7 +193,7 @@ <property name="text"> <string>Contrast</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -226,7 +226,7 @@ <property name="text"> <string>Brightness</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <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 7f413abc0..8d95814cc 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> @@ -65,13 +65,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>20</height> @@ -134,13 +134,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>20</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <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 860595e2d..03c0e3369 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 @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -34,7 +34,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -80,7 +80,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>24</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc index 3db7389ca..2c1c87d9c 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc @@ -18,7 +18,7 @@ #include "kis_custom_convolution_filter_configuration_widget.h" -#include <layout.h> +#include <tqlayout.h> #include <tqspinbox.h> #include <klocale.h> diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp index c20001d37..49826ccb9 100644 --- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp +++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_fastcolortransfer.h" -#include <layout.h> +#include <tqlayout.h> #include <kurlrequester.h> diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index 97379ceac..c14bd51a8 100644 --- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp index b4d0487a3..b83baa116 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp +++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_lens_correction.h" -#include <layout.h> +#include <tqlayout.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui index 25705322c..6ee2631a6 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc index b36e5ce97..7b836436e 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.cc +++ b/chalk/plugins/filters/levelfilter/kgradientslider.cc @@ -66,7 +66,7 @@ void KGradientSlider::paintEvent(TQPaintEvent *) /*if (!m_dragging) {*/ TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), this); + p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); pm.fill(); @@ -203,7 +203,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e ) m_gamma = 1.0 / pow (10, tmp); break; } - repaint(false); + tqrepaint(false); } void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e ) @@ -212,7 +212,7 @@ void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e ) return; m_dragging = false; - repaint(false); + tqrepaint(false); switch (m_grab_cursor) { case BlackCursor: @@ -283,7 +283,7 @@ void KGradientSlider::mouseMoveEvent ( TQMouseEvent * e ) } } - repaint(false); + tqrepaint(false); } void KGradientSlider::leaveEvent( TQEvent * ) @@ -294,7 +294,7 @@ void KGradientSlider::leaveEvent( TQEvent * ) void KGradientSlider::enableGamma(bool b) { m_gammaEnabled = b; - repaint(false); + tqrepaint(false); } double KGradientSlider::getGamma(void) @@ -311,7 +311,7 @@ void KGradientSlider::modifyBlack(int v) { double tmp = log10 (1.0 / m_gamma); m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } - repaint(false); + tqrepaint(false); } } void KGradientSlider::modifyWhite(int v) { @@ -323,7 +323,7 @@ void KGradientSlider::modifyWhite(int v) { double tmp = log10 (1.0 / m_gamma); m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } - repaint(false); + tqrepaint(false); } } void KGradientSlider::modifyGamma(double v) { @@ -332,7 +332,7 @@ void KGradientSlider::modifyGamma(double v) { double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); - repaint(false); + tqrepaint(false); } #include "kgradientslider.moc" diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc index 2dbf8a44d..b7c1cb00d 100644 --- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc +++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc @@ -22,7 +22,7 @@ #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpixmap.h> #include <tqpainter.h> #include <tqlabel.h> diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui index f365e3d14..841b78fb5 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="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -60,7 +60,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> @@ -70,13 +70,13 @@ <property name="name"> <cstring>histview</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>256</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>256</width> <height>256</height> @@ -88,7 +88,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -98,7 +98,7 @@ <property name="name"> <cstring>ingradient</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>20</height> @@ -107,7 +107,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>25</width> <height>20</height> @@ -148,7 +148,7 @@ <property name="text"> <string>1.0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -162,7 +162,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>25</width> <height>20</height> @@ -194,7 +194,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -204,7 +204,7 @@ <property name="name"> <cstring>outgradient</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>20</height> @@ -213,7 +213,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -240,7 +240,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp index 8692a50f5..c13db9527 100644 --- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp +++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_noise.h" -#include <layout.h> +#include <tqlayout.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui index 2741e1164..3bafae01f 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <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 72c0675b0..81ee1448f 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::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); srand ((uint) dt.secsTo(Y2000)); diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp index 9c8a44d8e..ba157e14d 100644 --- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp +++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_random_pick.h" -#include <layout.h> +#include <tqlayout.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui index 934d465fd..c9ce3acf5 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc index be233d703..627d105cf 100644 --- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc +++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc @@ -20,7 +20,7 @@ #include "kis_wdg_unsharp.h" -#include <layout.h> +#include <tqlayout.h> #include <tqtoolbutton.h> #include <kcombobox.h> diff --git a/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui index c2181eb88..faf74dd4d 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp index fb6c59c59..e7537c277 100644 --- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp +++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_wave.h" -#include <layout.h> +#include <tqlayout.h> #include <kcombobox.h> #include <knuminput.h> @@ -63,7 +63,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config) { widget()->intHAmplitude->setValue( value.toUInt() ); } - if (config->getProperty("horizontalshape", value)) + if (config->getProperty("horizontaltqshape", value)) { widget()->cbHShape->setCurrentItem( value.toUInt() ); } @@ -79,7 +79,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config) { widget()->intVAmplitude->setValue( value.toUInt() ); } - if (config->getProperty("verticalshape", value)) + if (config->getProperty("verticaltqshape", value)) { widget()->cbVShape->setCurrentItem( value.toUInt() ); } diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc index a7a9264e9..ddcfc4bd4 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.cc +++ b/chalk/plugins/filters/wavefilter/wavefilter.cc @@ -112,11 +112,11 @@ KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w) config->setProperty("horizontalwavelength", wN->widget()->intHWavelength->value() ); config->setProperty("horizontalshift", wN->widget()->intHShift->value() ); config->setProperty("horizontalamplitude", wN->widget()->intHAmplitude->value() ); - config->setProperty("horizontalshape", wN->widget()->cbHShape->currentItem() ); + config->setProperty("horizontaltqshape", wN->widget()->cbHShape->currentItem() ); config->setProperty("verticalwavelength", wN->widget()->intVWavelength->value() ); config->setProperty("verticalshift", wN->widget()->intVShift->value() ); config->setProperty("verticalamplitude", wN->widget()->intVAmplitude->value() ); - config->setProperty("verticalshape", wN->widget()->cbVShape->currentItem() ); + config->setProperty("verticaltqshape", wN->widget()->cbVShape->currentItem() ); } return config; } @@ -137,19 +137,19 @@ void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte int horizontalwavelength = (config && config->getProperty("horizontalwavelength", value)) ? value.toInt() : 50; int horizontalshift = (config && config->getProperty("horizontalshift", value)) ? value.toInt() : 50; int horizontalamplitude = (config && config->getProperty("horizontalamplitude", value)) ? value.toInt() : 4; - int horizontalshape = (config && config->getProperty("horizontalshape", value)) ? value.toInt() : 0; + int horizontaltqshape = (config && config->getProperty("horizontaltqshape", value)) ? value.toInt() : 0; int verticalwavelength = (config && config->getProperty("verticalwavelength", value)) ? value.toInt() : 50; int verticalshift = (config && config->getProperty("verticalshift", value)) ? value.toInt() : 50; int verticalamplitude = (config && config->getProperty("verticalamplitude", value)) ? value.toInt() : 4; - int verticalshape = (config && config->getProperty("verticalshape", value)) ? value.toInt() : 0; + int verticaltqshape = (config && config->getProperty("verticaltqshape", value)) ? value.toInt() : 0; KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); KisWaveCurve* verticalcurve; - if(verticalshape == 1) + if(verticaltqshape == 1) verticalcurve = new KisTriangleWaveCurve(verticalamplitude, verticalwavelength, verticalshift); else verticalcurve = new KisSinusoidalWaveCurve(verticalamplitude, verticalwavelength, verticalshift); KisWaveCurve* horizontalcurve; - if(horizontalshape == 1) + if(horizontaltqshape == 1) horizontalcurve = new KisTriangleWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift); else horizontalcurve = new KisSinusoidalWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift); diff --git a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui index e56f47604..b81322623 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>60</width> <height>20</height> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc index 7338ef545..c5f938642 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc @@ -59,18 +59,18 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info // // Most graphics apps -- especially the simple ones like Kolourpaint // and the previous version of this routine in Chalk took a brush -// shape -- often a simple ellipse -- and filled that shape with a +// tqshape -- often a simple ellipse -- and filled that tqshape with a // random 'spray' of single pixels. // // Other, more advanced graphics apps, like the Gimp or Photoshop, -// take the brush shape and paint just as with the brush paint op, +// take the brush tqshape and paint just as with the brush paint op, // only making the initial dab more transparent, and perhaps adding // extra transparence near the edges. Then, using a timer, when the // cursor stays in place, dab upon dab is positioned in the same // place, which makes the result less and less transparent. // // What I want to do here is create an airbrush that approaches a real -// one. It won't use brush shapes, instead going for the old-fashioned +// one. It won't use brush tqshapes, instead going for the old-fashioned // circle. Depending upon pressure, both the size of the dab and the // rate of paint deposition is determined. The edges of the dab are // more transparent than the center, with perhaps even some fully @@ -91,7 +91,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info KisPaintDeviceSP device = m_painter->device(); - // For now: use the current brush shape -- it beats calculating + // For now: use the current brush tqshape -- it beats calculating // ellipes and cones, and it shows the working of the timer. if (!device) return; diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc index c794c76a3..1ec165619 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc @@ -24,7 +24,7 @@ #include <tqrect.h> #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqtoolbutton.h> @@ -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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->tqsetSizePolicy(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 e88ecbe35..89207a506 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -83,7 +83,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> @@ -127,7 +127,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -183,7 +183,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <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 69542a6ea..c5f4e6eb0 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc @@ -22,7 +22,7 @@ #include <tqrect.h> #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqtabwidget.h> @@ -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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->tqsetSizePolicy(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/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc index 61e485a59..384e4e263 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc @@ -19,7 +19,7 @@ */ #include <tqevent.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <tqtimer.h> #include <tqpushbutton.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index c5c9d3246..6aff68c8d 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -19,7 +19,7 @@ #include <string.h> #include <tqpoint.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlistview.h> @@ -180,7 +180,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) palette->add(ent); if (!palette->save()) { - KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").arg(palette->filename()), i18n("Palette")); + KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").tqarg(palette->filename()), i18n("Palette")); } } } @@ -197,7 +197,7 @@ void KisToolColorPicker::displayPickedColor() TQString channelValueText; if (m_normaliseValues) { - channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); + channelValueText = i18n("%1%").tqarg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); } else { channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), i); } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index 4fcf642bd..f15bf7781 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -25,7 +25,7 @@ #include <klocale.h> #include <kcommand.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqcolor.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc index 0f0305e55..6df9f8da4 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <kdebug.h> @@ -58,7 +58,7 @@ KisToolGradient::KisToolGradient() m_endPos = KisPoint(0, 0); m_reverse = false; - m_shape = KisGradientPainter::GradientShapeLinear; + m_tqshape = KisGradientPainter::GradientShapeLinear; m_repeat = KisGradientPainter::GradientRepeatNone; m_antiAliasThreshold = 0.2; } @@ -157,7 +157,7 @@ void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e) progress->setSubject(&painter, true, true); } - bool painted = painter.paintGradient(m_startPos, m_endPos, m_shape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); + bool painted = painter.paintGradient(m_startPos, m_endPos, m_tqshape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); if (painted) { // does whole thing at moment @@ -237,7 +237,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check"); connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool))); - m_cmbShape = new TQComboBox(false, widget, "shape_combo"); + m_cmbShape = new TQComboBox(false, widget, "tqshape_combo"); connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int))); m_cmbShape->insertItem(i18n("Linear")); m_cmbShape->insertItem(i18n("Bi-Linear")); @@ -270,9 +270,9 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) return widget; } -void KisToolGradient::slotSetShape(int shape) +void KisToolGradient::slotSetShape(int tqshape) { - m_shape = static_cast<KisGradientPainter::enumGradientShape>(shape); + m_tqshape = static_cast<KisGradientPainter::enumGradientShape>(tqshape); } void KisToolGradient::slotSetRepeat(int repeat) diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h index 08ab06abb..29df8bf7b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h @@ -88,7 +88,7 @@ private: KisCanvasSubject *m_subject; - KisGradientPainter::enumGradientShape m_shape; + KisGradientPainter::enumGradientShape m_tqshape; KisGradientPainter::enumGradientRepeat m_repeat; bool m_reverse; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc index 7b1df85b2..243052cfe 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc @@ -21,7 +21,7 @@ */ #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <kdebug.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc index c624d30a4..bf23b4412 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc @@ -19,7 +19,7 @@ #include <tqfont.h> #include <tqrect.h> #include <tqimage.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <tqstring.h> #include <tqpixmap.h> @@ -156,7 +156,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) void KisToolText::setFont() { KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); - m_lbFontName->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize())); + m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); } TQWidget* KisToolText::createOptionWidget(TQWidget* parent) @@ -167,7 +167,7 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent) TQHBox *fontBox = new TQHBox(widget); m_lbFontName = new KSqueezedTextLabel(TQString(m_font.family() + ", %1") - .arg(m_font.pointSize()), fontBox); + .tqarg(m_font.pointSize()), fontBox); m_btnMoreFonts = new TQPushButton("...", fontBox); connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont())); diff --git a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui index 5463d3e34..7675b875d 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="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>200</width> <height>32767</height> @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -101,7 +101,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index 8f9eb2022..4a59c3845 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -20,7 +20,7 @@ #include <tqevent.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <tqrect.h> @@ -152,7 +152,7 @@ TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Brush")); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h index 9fd07e6dd..faeb32d8b 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h @@ -32,7 +32,7 @@ class KisSelectionOptions; /** * The selection brush creates a selection by painting with the current - * brush shape. Not sure what kind of an icon could represent this... + * brush tqshape. Not sure what kind of an icon could represent this... * Depends a bit on how we're going to visualize selections. */ class KisToolSelectBrush : public KisToolFreehand { diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index 0dfe1e1c4..cc1646808 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -21,7 +21,7 @@ */ #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqapplication.h> #include <tqcheckbox.h> @@ -189,7 +189,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Contiguous Area Selection")); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); l->setSpacing( 6 ); connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index cfce3704e..d16ab740e 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -21,7 +21,7 @@ #include <tqapplication.h> #include <tqpainter.h> #include <tqpen.h> -#include <layout.h> +#include <tqlayout.h> #include <kdebug.h> #include <kaction.h> @@ -203,12 +203,12 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e) rc = rc.normalize(); KisSelectionSP tmpSel = new KisSelection(dev); - KisAutobrushCircleShape shape(rc.width(),rc.height(), 1, 1); + KisAutobrushCircleShape tqshape(rc.width(),rc.height(), 1, 1); TQ_UINT8 value; for (int y = 0; y <= rc.height(); y++) for (int x = 0; x <= rc.width(); x++) { - value = MAX_SELECTED - shape.valueAt(x,y); + value = MAX_SELECTED - tqshape.valueAt(x,y); tmpSel->setSelected( x+rc.x(), y+rc.y(), value); } switch(m_selectAction) @@ -305,7 +305,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index a6f52abc1..118281e17 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -20,7 +20,7 @@ #include <tqevent.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <kdebug.h> @@ -139,7 +139,7 @@ TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Eraser")); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h index cb8b82ed2..c796ec3c7 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h @@ -30,7 +30,7 @@ class KisSelectionOptions; /** * The selection eraser makes a selection smaller by painting with the - * current eraser shape. Not sure what kind of an icon could represent + * current eraser tqshape. Not sure what kind of an icon could represent * this... Depends a bit on how we're going to visualize selections. */ class KisToolSelectEraser : public KisToolFreehand { diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index cf8bb81e6..8bac379ce 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqregion.h> #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <kaction.h> #include <kdebug.h> @@ -275,7 +275,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index f1a6436da..85a53c94c 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqregion.h> #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <kaction.h> #include <kdebug.h> @@ -294,7 +294,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index f4e4743d5..54bfbdd6d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -24,7 +24,7 @@ #include <tqapplication.h> #include <tqpainter.h> #include <tqpen.h> -#include <layout.h> +#include <tqlayout.h> #include <kdebug.h> #include <kaction.h> @@ -306,7 +306,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc index 371075088..8f5c9e5f8 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc @@ -500,7 +500,7 @@ void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const TQRect&) gc.drawLine(startx,endy + m_handleSize / 2 + 1, startx, controller->kiscanvas()->height()); gc.drawLine(endx,0,endx,starty - m_handleSize / 2); gc.drawLine(endx + m_handleSize / 2 + 1,starty, controller->kiscanvas()->width(), starty); - TQMemArray <TQRect> rects = m_handlesRegion.rects (); + TQMemArray <TQRect> rects = m_handlesRegion.tqrects (); for (TQMemArray <TQRect>::ConstIterator it = rects.begin (); it != rects.end (); ++it) { gc.fillRect (*it, TQt::black); diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui index 5cbcd4762..8d3bf1d82 100644 --- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui +++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -138,7 +138,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc index 69e7953e8..e18b096c2 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc @@ -21,7 +21,7 @@ #include <math.h> #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqrect.h> #include <kaction.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc index 9d47647d2..663e1324d 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc @@ -20,7 +20,7 @@ #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqrect.h> #include <tqlabel.h> #include <tqpushbutton.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h index 582c89cd7..c2a3715b0 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h @@ -57,7 +57,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("beziershape", i18n("Bezier Painting Tool")); } + virtual KisID id() { return KisID("beziertqshape", i18n("Bezier Painting Tool")); } }; #endif //__KIS_TOOL_CURVE_PAINT_H_ diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc index 2a8d10471..ed1200d4f 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc @@ -20,7 +20,7 @@ #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqrect.h> #include <tqlabel.h> #include <tqpushbutton.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index 463ef6411..d4a8605d8 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -23,7 +23,7 @@ #include <tqapplication.h> #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqrect.h> #include <kaction.h> @@ -576,7 +576,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc index b759c8f6f..e14abcb5d 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc @@ -20,7 +20,7 @@ #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqrect.h> #include <kaction.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.h b/chalk/plugins/tools/tool_curves/kis_tool_example.h index ad77204ec..e7bfd89ef 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.h @@ -60,7 +60,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("exampleshape", i18n("Example Tool")); } + virtual KisID id() { return KisID("exampletqshape", i18n("Example Tool")); } }; diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index b8d221ea9..42806771f 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -22,7 +22,7 @@ #include <set> #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqrect.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -762,7 +762,7 @@ void KisToolMagnetic::slotSetDistance (int dist) TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent) { m_optWidget = super::createOptionWidget(parent); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); TQGridLayout *box = new TQGridLayout(l, 2, 2, 3); box->setColStretch(0, 1); box->setColStretch(1, 1); diff --git a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui index 1384ff58f..035eff3be 100644 --- a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui +++ b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc index a23de04bd..e53c96da8 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc @@ -21,7 +21,7 @@ #include <tqbitmap.h> #include <tqpainter.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <kaction.h> diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index 54dd393d2..ae07e5895 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqregion.h> #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <kaction.h> #include <kdebug.h> diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index 74274cdda..700efa4b6 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -19,7 +19,7 @@ */ #include <tqpoint.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <tqcombobox.h> diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc index 53743ae16..037f6bb52 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cc +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqspinbox.h> -#include <layout.h> +#include <tqlayout.h> #include <kaction.h> #include <kdebug.h> diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h index 8128dcdf3..947dae25c 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.h +++ b/chalk/plugins/tools/tool_star/kis_tool_star.h @@ -94,7 +94,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("starshape", i18n("Star Tool")); } + virtual KisID id() { return KisID("startqshape", i18n("Star Tool")); } }; diff --git a/chalk/plugins/tools/tool_star/wdg_tool_star.ui b/chalk/plugins/tools/tool_star/wdg_tool_star.ui index a6395037a..3f4f30f57 100644 --- a/chalk/plugins/tools/tool_star/wdg_tool_star.ui +++ b/chalk/plugins/tools/tool_star/wdg_tool_star.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui index 5375d5648..2cf6806e7 100644 --- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui +++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> @@ -43,7 +43,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -72,7 +72,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -103,7 +103,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -111,7 +111,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -140,7 +140,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -178,7 +178,7 @@ <property name="text"> <string>Filter:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <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 552e4c40f..1d2c4d611 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->sizeHint()); + resize(m_page->tqsizeHint()); 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 876f03199..67c6028b5 100644 --- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -144,7 +144,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -233,7 +233,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index 00c0c8200..0498505d1 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -91,7 +91,7 @@ void ColorSpaceConversion::slotImgColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 image through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .arg(image->colorSpace()->id().name()), + .tqarg(image->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -128,7 +128,7 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 layer through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .arg(dev->colorSpace()->id().name()), + .tqarg(dev->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index 31163eb72..6f9af1c60 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->sizeHint()); + resize(m_page->tqsizeHint()); 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 ddb47f471..fedb1fd17 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->sizeHint()); + resize(m_page->tqsizeHint()); 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 2354cfbc0..69aae6249 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>190</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <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 f130a46b3..60313cb22 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -22,7 +22,7 @@ #include "kis_dlg_filtersgallery.h" #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqdatetime.h> @@ -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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); + //m_widget->configWidgetHolder->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); // Initialize preview widget if (m_view->canvasSubject()->currentImg() && m_view->canvasSubject()->currentImg()->activeDevice()) @@ -64,10 +64,10 @@ 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( minimumSizeHint()); - m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); + resize( tqminimumSizeHint()); + m_widget->previewWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); - m_widget->configWidgetHolder->layout()->add(m_labelNoCW); + m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW); m_labelNoCW->hide(); } @@ -81,7 +81,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) m_currentFilter = kisitem->filter(); if(m_currentConfigWidget != 0) { - m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget); + m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget); delete m_currentConfigWidget; m_currentConfigWidget = 0; } else { @@ -94,8 +94,8 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, activeLayer->paintDevice()); if(m_currentConfigWidget != 0) { - //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget); + //m_currentConfigWidget->tqsetSizePolicy(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 03972a16b..4b8127709 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="minimumSize"> + <property name="tqminimumSize"> <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 0ceb3dd40..90acf1309 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->sizeHint()); + resize(m_page->tqsizeHint()); } DlgHistogram::~DlgHistogram() diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui index be6f9552a..320b7d7af 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -75,7 +75,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -124,7 +124,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>150</height> @@ -133,7 +133,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc index 6ee07f306..8a6567528 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->sizeHint()); + resize(m_page->tqsizeHint()); unblockAll(); diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc index d084060bc..6d24d60ac 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->sizeHint()); + resize(m_page->tqsizeHint()); unblockAll(); diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui index 8e8ca43df..1686fe97a 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>65</width> <height>20</height> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>65</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> @@ -197,7 +197,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -214,7 +214,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -307,7 +307,7 @@ <property name="text"> <string>Filter:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui index b9b3e400a..13cd72a8c 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui @@ -76,7 +76,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -93,7 +93,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui index 72a70c8a3..d3a8326a9 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui @@ -96,7 +96,7 @@ <property name="text"> <string>100</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc index 300161a8c..bb21f6f77 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->sizeHint()); + resize(m_page->tqsizeHint()); 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 566dabc46..5e327aa8b 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->sizeHint()); + resize(m_page->tqsizeHint()); 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 5b4c8747e..b69b998fa 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->sizeHint()); + resize(m_page->tqsizeHint()); 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 e4a3386d2..dafb66698 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->sizeHint()); + resize(m_page->tqsizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc index 5b65a9e4a..8a137374a 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/perftest.cc @@ -27,7 +27,7 @@ #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqdatetime.h> #include <klocale.h> @@ -140,7 +140,7 @@ void PerfTest::slotPerfTest() } if (dlgPerfTest->page()->chkShape->isChecked()) { kdDebug() << "Shapetest\n"; - TQString s = shapeTest(testCount); + TQString s = tqshapeTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } @@ -293,10 +293,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, p.end(); report = report.append(TQString(" %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -316,10 +316,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, p.end(); report = report.append(TQString(" %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -339,10 +339,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, } p.end(); report = report.append(TQString(" %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -362,10 +362,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, } p.end(); report = report.append(TQString(" %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ // Small with varied source opacity @@ -387,10 +387,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, p.end(); report = report.append(TQString(" %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); return report; @@ -418,21 +418,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(0, 0, 1000, 1000); } - report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(50, 50, 500, 500); } - report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(-50, -50, 1100, 1100); } - report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Opaque Rect fill @@ -440,21 +440,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Transparent rect fill @@ -462,21 +462,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Colour fill @@ -489,7 +489,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) p.setCompositeOp(COMPOSITE_OVER); p.fillColor(0,0); } - report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Pattern fill @@ -505,7 +505,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) p.setCompositeOp(COMPOSITE_OVER); p.fillPattern(0,0); } - report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); @@ -549,7 +549,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount) } } } - report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); c= TQt::black; t.restart(); @@ -560,7 +560,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount) } } } - report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } @@ -571,7 +571,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount) } -TQString PerfTest::shapeTest(TQ_UINT32 testCount) +TQString PerfTest::tqshapeTest(TQ_UINT32 testCount) { return TQString("Shape test\n"); } @@ -606,7 +606,7 @@ TQString PerfTest::rotateTest(TQ_UINT32 testCount) delete img; } } - report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } return report; } @@ -643,7 +643,7 @@ TQString PerfTest::colorConversionTest(TQ_UINT32 testCount) img2->convertTo(KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it2,"")); delete img2; } - report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } @@ -681,7 +681,7 @@ TQString PerfTest::filterTest(TQ_UINT32 testCount) f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), TQRect(0, 0, 1000, 1000)); f->disableProgress(); } - report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } @@ -709,7 +709,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount) delete[] newData; } - report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").tqarg(testCount).tqarg(t.elapsed())); // On tiles with data @@ -726,7 +726,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount) delete[] newData; } - report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").tqarg(testCount).tqarg(t.elapsed())); return report; } @@ -755,7 +755,7 @@ TQString PerfTest::writeBytesTest(TQ_UINT32 testCount) l->writeBytes(data, 0, 0, 1000, 1000); } delete[] data; - report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); return report; @@ -788,7 +788,7 @@ TQString hlineRODefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -820,7 +820,7 @@ TQString hlineRO(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -847,7 +847,7 @@ TQString hlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -878,7 +878,7 @@ TQString hlineWR(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -903,7 +903,7 @@ TQString vlineRODefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -932,7 +932,7 @@ TQString vlineRO(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -957,7 +957,7 @@ TQString vlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount) @@ -985,7 +985,7 @@ TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -1005,7 +1005,7 @@ TQString rectRODefault(KisDoc * doc, TQ_UINT32 testCount) } } - return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -1030,7 +1030,7 @@ TQString rectRO(KisDoc * doc, TQ_UINT32 testCount) } } - return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -1052,7 +1052,7 @@ TQString rectWRDefault(KisDoc * doc, TQ_UINT32 testCount) } } - return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -1079,7 +1079,7 @@ TQString rectWR(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } @@ -1140,7 +1140,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount) CALLGRIND_DUMP_STATS(); #endif - report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); img->newLayer("layer 2", OPACITY_OPAQUE); l = img->activeDevice(); @@ -1162,7 +1162,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount) m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512)); } - report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); return report; } @@ -1190,7 +1190,7 @@ TQString PerfTest::paintViewFPSTest() CALLGRIND_DUMP_STATS(); #endif - report = report.append(TQString(" painted current view at %1 frames per second\n").arg(numViewsPainted)); + report = report.append(TQString(" painted current view at %1 frames per second\n").tqarg(numViewsPainted)); return report; } diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h index 959233e4c..cbd8799fb 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.h +++ b/chalk/plugins/viewplugins/performancetest/perftest.h @@ -46,7 +46,7 @@ private: TQString fillTest(TQ_UINT32 testCount); TQString gradientTest(TQ_UINT32 testCount); TQString pixelTest(TQ_UINT32 testCount); - TQString shapeTest(TQ_UINT32 testCount); + TQString tqshapeTest(TQ_UINT32 testCount); TQString layerTest(TQ_UINT32 testCount); TQString scaleTest(TQ_UINT32 testCount); TQString rotateTest(TQ_UINT32 testCount); diff --git a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui index b019e9e11..20f668255 100644 --- a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui +++ b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui @@ -233,7 +233,7 @@ </widget> <widget class="TQLayoutWidget" row="18" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index 9440a8fe4..03bd6b52c 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->sizeHint()); + resize(m_page->tqsizeHint()); 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 af18881a6..884776f1f 100644 --- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -65,7 +65,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -96,7 +96,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -177,7 +177,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>91</height> diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index 585290ae3..6e942c389 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -25,7 +25,7 @@ #include <tqbitmap.h> #include <tqdragobject.h> #include <tqimage.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqvbox.h> #include <kaccel.h> @@ -153,7 +153,7 @@ bool KSnapshot::save( const KURL& url ) TQString caption = i18n("Unable to Save Image"); TQString text = i18n("KSnapshot was unable to save the image to\n%1.") - .arg(url.prettyURL()); + .tqarg(url.prettyURL()); KMessageBox::error(this, text, caption); } @@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url ) void KSnapshot::slotCopy() { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setPixmap( snapshot ); } @@ -320,16 +320,16 @@ Window findRealWindow( Window w, int depth = 0 ) return w; } Window root, parent; - Window* children; - unsigned int nchildren; + Window* tqchildren; + unsigned int ntqchildren; Window ret = None; - if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { for( unsigned int i = 0; - i < nchildren && ret == None; + i < ntqchildren && ret == None; ++i ) - ret = findRealWindow( children[ i ], depth + 1 ); - if( children != NULL ) - XFree( children ); + ret = findRealWindow( tqchildren[ i ], depth + 1 ); + if( tqchildren != NULL ) + XFree( tqchildren ); } return ret; } @@ -365,12 +365,12 @@ void KSnapshot::performGrab() h += 2 * border; Window parent; - Window* children; - unsigned int nchildren; + Window* tqchildren; + unsigned int ntqchildren; if( XQueryTree( qt_xdisplay(), child, &root, &parent, - &children, &nchildren ) != 0 ) { - if( children != NULL ) - XFree( children ); + &tqchildren, &ntqchildren ) != 0 ) { + if( tqchildren != NULL ) + XFree( tqchildren ); int newx, newy; Window dummy; if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(), @@ -390,7 +390,7 @@ void KSnapshot::performGrab() int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child, ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost shape of the window; + //The ShapeBounding region is the outermost tqshape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h index 5c0951a8e..eb8fa60a1 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) { - setAlignment(AlignHCenter | AlignVCenter); + tqsetAlignment(AlignHCenter | AlignVCenter); } virtual ~KSnapshotThumb() {} diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui index 65ae3c99f..346439022 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="minimumSize"> + <property name="tqminimumSize"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index d7b7729d5..ec5ba7cc0 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -21,7 +21,7 @@ #include "regiongrabber.h" #include <tqpainter.h> -#include <palette.h> +#include <tqpalette.h> #include <tqstyle.h> #include <tqtimer.h> #include <tqtooltip.h> @@ -41,8 +41,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name ) void SizeTip::setTip( const TQRect &rect ) { - TQString tip = TQString( "%1x%2" ).arg( rect.width() ) - .arg( rect.height() ); + TQString tip = TQString( "%1x%2" ).tqarg( rect.width() ) + .tqarg( rect.height() ); setText( tip ); adjustSize(); @@ -52,7 +52,7 @@ void SizeTip::setTip( const TQRect &rect ) void SizeTip::positionTip( const TQRect &rect ) { - TQRect tipRect = geometry(); + TQRect tipRect = tqgeometry(); tipRect.moveTopLeft( TQPoint( 0, 0 ) ); if ( rect.intersects( tipRect ) ) @@ -61,7 +61,7 @@ void SizeTip::positionTip( const TQRect &rect ) tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) ); if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) ) - tipRect.moveBottomRight( geometry().bottomRight() ); + tipRect.moveBottomRight( tqgeometry().bottomRight() ); } move( tipRect.topLeft() ); @@ -161,8 +161,8 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), - TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), + TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); p.end(); } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp index 45c1705af..04f7b6537 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp @@ -209,7 +209,7 @@ Kross::Api::Object::Ptr ChalkCoreFactory::newImage(Kross::Api::List::Ptr args) KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(csname, ""), ""); if(!cs) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(csname ) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(csname ) ) ); return 0; } @@ -225,9 +225,9 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager) : Kross::Api::Module("chalkcore") , m_manager(manager), m_factory(0) { - TQMap<TQString, Object::Ptr> children = manager->getChildren(); - kdDebug(41011) << " there are " << children.size() << endl; - for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++) + TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren(); + kdDebug(41011) << " there are " << tqchildren.size() << endl; + for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++) { kdDebug(41011) << it.key() << " " << it.data() << endl; } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h index 5ddb004de..d719edd6e 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h @@ -108,7 +108,7 @@ namespace Kross { namespace ChalkCore { */ Kross::Api::Object::Ptr getBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a circular shape + * This function return a Brush with a circular tqshape * It takes at least two arguments : * - width * - height @@ -127,7 +127,7 @@ namespace Kross { namespace ChalkCore { */ Kross::Api::Object::Ptr newCircleBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a rectangular shape + * This function return a Brush with a rectangular tqshape * It takes at least two arguments : * - width * - height diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp index e2f09a582..ecac55013 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp @@ -53,7 +53,7 @@ Kross::Api::Object::Ptr Filter::process(Kross::Api::List::Ptr args) PaintLayer* src = (PaintLayer*)args->item(0).data(); if(!m_filter->workWith( src->paintLayer()->paintDevice()->colorSpace())) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("process") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("process") ) ); } TQRect rect; if( args->count() >1) diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp index 1486d4153..c93d6e880 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp @@ -80,7 +80,7 @@ Kross::Api::Object::Ptr Image::convertToColorspace(Kross::Api::List::Ptr args) KisColorSpace * dstCS = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(Kross::Api::Variant::toString(args->item(0)), ""), ""); if(!dstCS) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } m_image->convertTo(dstCS); diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h index 0b22ebf56..b01ba0a89 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h @@ -246,7 +246,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem pixel.push_back( *((float*) data) ); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").arg("getPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").tqarg("getPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } @@ -274,7 +274,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem *((float*) data) = pixel[i].toDouble(); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").arg("setPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").tqarg("setPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp index 9f27adc6a..5f800f6ae 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp @@ -130,7 +130,7 @@ Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args) { return new Histogram( paintLayer().data(), factory->generate() , type); } else { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("createHistogram") + "\n" + i18n("The histogram %1 is not available").arg(histoname) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("createHistogram") + "\n" + i18n("The histogram %1 is not available").tqarg(histoname) ) ); } return 0; } @@ -172,7 +172,7 @@ Kross::Api::Object::Ptr PaintLayer::convertToColorspace(Kross::Api::List::Ptr ar if(!dstCS) { // FIXME: inform user - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } paintLayer()->paintDevice()->convertTo(dstCS); diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp index 5aee14319..449913036 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp @@ -110,7 +110,7 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) TQVariant firstlineVariant = *kernelH.begin(); if(firstlineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); } TQValueList<TQVariant> firstline = firstlineVariant.toList(); @@ -126,12 +126,12 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) TQVariant lineVariant = *kernelH.begin(); if(lineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); } TQValueList<TQVariant> line = firstlineVariant.toList(); if(line.size() != kernel.width) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); } uint j = 0; for(TQValueList<TQVariant>::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ ) diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp index c8ef92c50..e166de7cb 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp @@ -52,7 +52,7 @@ Kross::Api::Object::Ptr Wavelet::getNCoeff(Kross::Api::List::Ptr args) TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + n )); } @@ -63,7 +63,7 @@ Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args) double v = Kross::Api::Variant::toDouble(args->item(1)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); } *(m_wavelet->coeffs + n ) = v; return 0; @@ -75,7 +75,7 @@ Kross::Api::Object::Ptr Wavelet::getXYCoeff(Kross::Api::List::Ptr args) TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth )); } @@ -87,7 +87,7 @@ Kross::Api::Object::Ptr Wavelet::setXYCoeff(Kross::Api::List::Ptr args) double v = Kross::Api::Variant::toDouble(args->item(2)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setXYCoeff") + "\n" + i18n("Index out of bound") )); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setXYCoeff") + "\n" + i18n("Index out of bound") )); } *(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth ) = v; return 0; diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb index 7f6a9b05b..1ec25dcdd 100644 --- a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb +++ b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb @@ -60,11 +60,11 @@ for i in 1..100 painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - shape = rand * 7 + tqshape = rand * 7 painter.setStrokeStyle(1) - if( shape < 1 ) + if( tqshape < 1 ) painter.paintAt(rand * width , rand * height,1.1) - elsif(shape < 2 ) + elsif(tqshape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -72,14 +72,14 @@ for i in 1..100 ys[i] = rand*height end painter.paintPolyline(xs,ys) - elsif(shape < 3) + elsif(tqshape < 3) painter.paintLine(rand * width, rand * height, 1.1, rand * width, rand * height,1.1) - elsif(shape < 4) + elsif(tqshape < 4) painter.paintBezierCurve(rand * width, rand * height, 1.1, rand * width, rand * height, rand * width , rand * height, rand * width, rand * height, 1.1) - elsif(shape < 5) + elsif(tqshape < 5) randomizeStyle(painter) painter.paintEllipse(rand * width, rand * height, rand * width, rand * height, 1.1) - elsif(shape < 6) + elsif(tqshape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -88,7 +88,7 @@ for i in 1..100 end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(shape < 7) + elsif(tqshape < 7) randomizeStyle(painter) painter.paintRect(rand * width, rand * height, rand * width, rand * height, 1.1) end diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb index 68610cc58..b7c784fc1 100644 --- a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb +++ b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb @@ -91,11 +91,11 @@ class TorturePainting painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - shape = rand * 7 + tqshape = rand * 7 painter.setStrokeStyle(1) - if( shape < 1 ) + if( tqshape < 1 ) painter.paintAt(rand * @width , rand * @height,1.1) - elsif(shape < 2 ) + elsif(tqshape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -103,14 +103,14 @@ class TorturePainting ys[i] = rand*@height end painter.paintPolyline(xs,ys) - elsif(shape < 3) + elsif(tqshape < 3) painter.paintLine(rand * @width, rand * @height, 1.1, rand * @width, rand * @height,1.1) - elsif(shape < 4) + elsif(tqshape < 4) painter.paintBezierCurve(rand * @width, rand * @height, 1.1, rand * @width, rand * @height, rand * @width , rand * @height, rand * @width, rand * @height, 1.1) - elsif(shape < 5) + elsif(tqshape < 5) randomizeStyle(painter) painter.paintEllipse(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) - elsif(shape < 6) + elsif(tqshape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -119,7 +119,7 @@ class TorturePainting end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(shape < 7) + elsif(tqshape < 7) randomizeStyle(painter) painter.paintRect(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) end diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc index 3da5db516..99078d0f2 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->sizeHint()); + resize(m_page->tqsizeHint()); 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 7e611f676..f1eeeaa22 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="sizeHint"> + <property name="tqsizeHint"> <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 26a05d842..a2c43aa91 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -29,7 +29,7 @@ using namespace std; #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <knuminput.h> @@ -46,11 +46,11 @@ DlgShearImage::DlgShearImage( TQWidget * parent, m_lock = false; m_page = new WdgShearImage(this, "shear_image"); - m_page->layout()->setMargin(0); + m_page->tqlayout()->setMargin(0); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); 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 6facd42ac..848eb3284 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="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>100</height> diff --git a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui index de5850d6d..3382fe1fc 100644 --- a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui +++ b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -92,7 +92,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui index a9c7adea5..65f20e23d 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="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -95,13 +95,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -121,7 +121,7 @@ <property name="text"> <string>Current Pick</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -132,7 +132,7 @@ <property name="text"> <string>Original</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -228,7 +228,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <property name="geometry"> <rect> @@ -268,7 +268,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>187</height> @@ -287,7 +287,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>556</height> @@ -322,13 +322,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -348,7 +348,7 @@ <property name="text"> <string>Lighter</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -364,13 +364,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -390,7 +390,7 @@ <property name="text"> <string>Current Pick</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -406,13 +406,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -432,7 +432,7 @@ <property name="text"> <string>Darker</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -460,13 +460,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>540</width> <height>556</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>540</width> <height>556</height> @@ -497,13 +497,13 @@ <height>150</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -531,7 +531,7 @@ <property name="text"> <string>More Red</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -550,7 +550,7 @@ <property name="text"> <string>More Cyan</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -574,13 +574,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -608,7 +608,7 @@ <property name="text"> <string>More Green</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -632,13 +632,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -671,13 +671,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -710,13 +710,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -744,7 +744,7 @@ <property name="text"> <string>Current Pick</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -763,7 +763,7 @@ <property name="text"> <string>More Yellow</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -787,13 +787,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -829,13 +829,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -863,7 +863,7 @@ <property name="text"> <string>More Magenta</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -882,7 +882,7 @@ <property name="text"> <string>More Blue</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> |