summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/filters
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:11 -0600
commit94844816550ad672ccfcdc25659c625546239998 (patch)
treee35fc60fd736c645d59f6408af032774ad8023d3 /chalk/plugins/filters
parent2a811c38c74c03648ecf857e566c44483cbad706 (diff)
downloadkoffice-94844816550ad672ccfcdc25659c625546239998.tar.gz
koffice-94844816550ad672ccfcdc25659c625546239998.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'chalk/plugins/filters')
-rw-r--r--chalk/plugins/filters/blur/kis_blur_filter.cc6
-rw-r--r--chalk/plugins/filters/blur/kis_wdg_blur.cc4
-rw-r--r--chalk/plugins/filters/blur/wdgblur.ui10
-rw-r--r--chalk/plugins/filters/bumpmap/bumpmap.cc2
-rw-r--r--chalk/plugins/filters/bumpmap/wdgbumpmap.ui6
-rw-r--r--chalk/plugins/filters/cimg/CImg.h22
-rw-r--r--chalk/plugins/filters/cimg/kis_cimg_filter.cc4
-rw-r--r--chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc2
-rw-r--r--chalk/plugins/filters/cimg/wdg_cimg.ui2
-rw-r--r--chalk/plugins/filters/colorify/KisWdgColorify.cpp2
-rw-r--r--chalk/plugins/filters/colorify/WdgColorifyBase.ui6
-rw-r--r--chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc2
-rw-r--r--chalk/plugins/filters/colors/wdgcolortoalphabase.ui6
-rw-r--r--chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc4
-rw-r--r--chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc2
-rw-r--r--chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui26
-rw-r--r--chalk/plugins/filters/colorsfilters/wdg_perchannel.ui12
-rw-r--r--chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui14
-rw-r--r--chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc2
-rw-r--r--chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp2
-rw-r--r--chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui4
-rw-r--r--chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp2
-rw-r--r--chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui8
-rw-r--r--chalk/plugins/filters/levelfilter/kgradientslider.cc16
-rw-r--r--chalk/plugins/filters/levelfilter/kis_level_filter.cc2
-rw-r--r--chalk/plugins/filters/levelfilter/wdg_level.ui34
-rw-r--r--chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp2
-rw-r--r--chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui4
-rw-r--r--chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc2
-rw-r--r--chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp2
-rw-r--r--chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui4
-rw-r--r--chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc2
-rw-r--r--chalk/plugins/filters/unsharp/wdgunsharp.ui4
-rw-r--r--chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp6
-rw-r--r--chalk/plugins/filters/wavefilter/wavefilter.cc12
-rw-r--r--chalk/plugins/filters/wavefilter/wdgwaveoptions.ui4
36 files changed, 122 insertions, 122 deletions
diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cc
index 0217b7e1..8d360497 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("tqshape", wCTA->widget()->cbShape->currentItem());
+ config->setProperty("shape", 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 tqshape = (config->getProperty("tqshape", value)) ? value.toInt() : 0;
+ int shape = (config->getProperty("shape", 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(tqshape)
+ switch(shape)
{
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 dc836971..b12e6b11 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 <tqlayout.h>
+#include <layout.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("tqshape", value))
+ if (config->getProperty("shape", value))
{
widget()->cbShape->setCurrentItem( value.toUInt() );
}
diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui
index 3e381bbe..8cd89f63 100644
--- a/chalk/plugins/filters/blur/wdgblur.ui
+++ b/chalk/plugins/filters/blur/wdgblur.ui
@@ -32,7 +32,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -49,7 +49,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -58,7 +58,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<grid>
<property name="name">
@@ -76,13 +76,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>16</width>
<height>32767</height>
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc
index 4ae92469..38d31007 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 <tqlayout.h>
+#include <layout.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 513912ea..2934623a 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="tqalignment">
+ <property name="alignment">
<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="tqsizeHint">
+ <property name="sizeHint">
<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="tqalignment">
+ <property name="alignment">
<set>AlignAuto</set>
</property>
<grid>
diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h
index abd1bb66..23c7e221 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 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).
+ \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).
\see CImg::get_append()
**/
@@ -7772,7 +7772,7 @@ namespace cimg_library {
//! Return a resized image.
/**
- \param src = Image giving the tqgeometry of the resize.
+ \param src = Image giving the geometry 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 tqgeometry of the resize.
+ \param disp = Display giving the geometry 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 tqgeometry of the resize.
+ \param src = Image giving the geometry 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 tqgeometry of the resize.
+ \param disp = Display giving the geometry 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 tqgeometry.
+ \param sigma = regularity of the tensor-valued geometry.
\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 tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+ \param align : specify the alignment 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 tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+ \param align : specify the alignment 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 tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+ \param align : specify the alignment 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 tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+ \param align : specify the alignment 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 665dfc09..9c3a7543 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 tqgeometry");
+ const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image geometry");
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 tqgeometry");
+ const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output geometry");
//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 b65a435f..46df5cc6 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 "tqlayout.h"
+#include "layout.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 397e52e6..09d4e323 100644
--- a/chalk/plugins/filters/cimg/wdg_cimg.ui
+++ b/chalk/plugins/filters/cimg/wdg_cimg.ui
@@ -42,7 +42,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp
index 5b03ad70..75635c8c 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 <tqlayout.h>
+#include <layout.h>
#include <tqspinbox.h>
#include <kcolorbutton.h>
diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui
index ad1c062e..90337f22 100644
--- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui
+++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -38,7 +38,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
index 31b726bf..14d4c26d 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 <tqlayout.h>
+#include <layout.h>
#include <tqspinbox.h>
#include <kcolorbutton.h>
diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui
index 525b221c..70ff3071 100644
--- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui
+++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -38,7 +38,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
index a97f809b..c0fcee28 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 <tqlayout.h>
+#include <layout.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 - tqinvalidate it
+ // If the adjustment was cached, it now has changed - invalidate 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 928baded..8b6aa949 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 <tqlayout.h>
+#include <layout.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 1e576f66..3382102c 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>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -50,13 +50,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>20</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>250</width>
<height>20</height>
@@ -84,13 +84,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>254</width>
<height>254</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>254</width>
<height>254</height>
@@ -116,13 +116,13 @@
<property name="name">
<cstring>kCurve</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>250</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>250</width>
<height>250</height>
@@ -143,13 +143,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>250</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>250</height>
@@ -169,7 +169,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<grid>
<property name="name">
@@ -193,7 +193,7 @@
<property name="text">
<string>Contrast</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -226,7 +226,7 @@
<property name="text">
<string>Brightness</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -253,7 +253,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>20</height>
diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
index 8d95814c..7f413abc 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>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -47,7 +47,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@@ -65,13 +65,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
@@ -134,13 +134,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>32767</height>
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
index 03c0e336..860595e2 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>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -34,7 +34,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -80,7 +80,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -115,7 +115,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>24</width>
<height>20</height>
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
index 2c1c87d9..3db7389c 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 <tqlayout.h>
+#include <layout.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 49826ccb..c20001d3 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 <tqlayout.h>
+#include <layout.h>
#include <kurlrequester.h>
diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
index c14bd51a..97379cea 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>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -55,7 +55,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>101</height>
diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
index b83baa11..b4d0487a 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 <tqlayout.h>
+#include <layout.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
index 6ee2631a..25705322 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
+++ b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -118,7 +118,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -135,7 +135,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc
index 7b836436..b36e5ce9 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.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+ p1.begin(TQT_TQPAINTDEVICE(&pm), this);
pm.fill();
@@ -203,7 +203,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e )
m_gamma = 1.0 / pow (10, tmp);
break;
}
- tqrepaint(false);
+ repaint(false);
}
void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
@@ -212,7 +212,7 @@ void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
return;
m_dragging = false;
- tqrepaint(false);
+ repaint(false);
switch (m_grab_cursor) {
case BlackCursor:
@@ -283,7 +283,7 @@ void KGradientSlider::mouseMoveEvent ( TQMouseEvent * e )
}
}
- tqrepaint(false);
+ repaint(false);
}
void KGradientSlider::leaveEvent( TQEvent * )
@@ -294,7 +294,7 @@ void KGradientSlider::leaveEvent( TQEvent * )
void KGradientSlider::enableGamma(bool b)
{
m_gammaEnabled = b;
- tqrepaint(false);
+ repaint(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);
}
- tqrepaint(false);
+ repaint(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);
}
- tqrepaint(false);
+ repaint(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);
- tqrepaint(false);
+ repaint(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 b7c1cb00..2dbf8a44 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 <tqlayout.h>
+#include <layout.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 841b78fb..f365e3d1 100644
--- a/chalk/plugins/filters/levelfilter/wdg_level.ui
+++ b/chalk/plugins/filters/levelfilter/wdg_level.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -70,13 +70,13 @@
<property name="name">
<cstring>histview</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>256</width>
<height>256</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>256</width>
<height>256</height>
@@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -98,7 +98,7 @@
<property name="name">
<cstring>ingradient</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>256</width>
<height>20</height>
@@ -107,7 +107,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>25</width>
<height>20</height>
@@ -148,7 +148,7 @@
<property name="text">
<string>1.0</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>25</width>
<height>20</height>
@@ -194,7 +194,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -204,7 +204,7 @@
<property name="name">
<cstring>outgradient</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>256</width>
<height>20</height>
@@ -213,7 +213,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -240,7 +240,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -274,7 +274,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
index c13db952..8692a50f 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 <tqlayout.h>
+#include <layout.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
index 3bafae01..2741e116 100644
--- a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
+++ b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
index 81ee1448..72c0675b 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
@@ -124,7 +124,7 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c
KisColorSpace * cs = src->colorSpace();
- TQDateTime dt = TQDateTime::tqcurrentDateTime();
+ TQDateTime dt = TQDateTime::currentDateTime();
TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
srand ((uint) dt.secsTo(Y2000));
diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
index ba157e14..9c8a44d8 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 <tqlayout.h>
+#include <layout.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
index c9ce3acf..934d465f 100644
--- a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
+++ b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
index 627d105c..be233d70 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 <tqlayout.h>
+#include <layout.h>
#include <tqtoolbutton.h>
#include <kcombobox.h>
diff --git a/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui
index faf74dd4..c2181eb8 100644
--- a/chalk/plugins/filters/unsharp/wdgunsharp.ui
+++ b/chalk/plugins/filters/unsharp/wdgunsharp.ui
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -115,7 +115,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
index e7537c27..fb6c59c5 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 <tqlayout.h>
+#include <layout.h>
#include <kcombobox.h>
#include <knuminput.h>
@@ -63,7 +63,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
{
widget()->intHAmplitude->setValue( value.toUInt() );
}
- if (config->getProperty("horizontaltqshape", value))
+ if (config->getProperty("horizontalshape", value))
{
widget()->cbHShape->setCurrentItem( value.toUInt() );
}
@@ -79,7 +79,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
{
widget()->intVAmplitude->setValue( value.toUInt() );
}
- if (config->getProperty("verticaltqshape", value))
+ if (config->getProperty("verticalshape", value))
{
widget()->cbVShape->setCurrentItem( value.toUInt() );
}
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc
index ddcfc4bd..a7a9264e 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("horizontaltqshape", wN->widget()->cbHShape->currentItem() );
+ config->setProperty("horizontalshape", 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("verticaltqshape", wN->widget()->cbVShape->currentItem() );
+ config->setProperty("verticalshape", 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 horizontaltqshape = (config && config->getProperty("horizontaltqshape", value)) ? value.toInt() : 0;
+ int horizontalshape = (config && config->getProperty("horizontalshape", 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 verticaltqshape = (config && config->getProperty("verticaltqshape", value)) ? value.toInt() : 0;
+ int verticalshape = (config && config->getProperty("verticalshape", value)) ? value.toInt() : 0;
KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true );
KisWaveCurve* verticalcurve;
- if(verticaltqshape == 1)
+ if(verticalshape == 1)
verticalcurve = new KisTriangleWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
else
verticalcurve = new KisSinusoidalWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
KisWaveCurve* horizontalcurve;
- if(horizontaltqshape == 1)
+ if(horizontalshape == 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 b8132262..e56f4760 100644
--- a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
+++ b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>