Fix inadvertent tqt changes. Part of an extensive cleanup of various problems

with kipi-plugins, digikam, and gwenview to resolve bug reports 241, 962, 963.
pull/1/head
Darrell Anderson 12 years ago
parent 207d90d427
commit 6029a1648f

@ -27,7 +27,7 @@ digikamimageplugin_adjustcurves_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari
kde_services_DATA = digikamimageplugin_adjustcurves.desktop kde_services_DATA = digikamimageplugin_adjustcurves.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_adjustcurves.la kde_module_LTLIBRARIES = digikamimageplugin_adjustcurves.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_adjustcurves_ui.rc rc_DATA = digikamimageplugin_adjustcurves_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_adjustlevels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari
kde_services_DATA = digikamimageplugin_adjustlevels.desktop kde_services_DATA = digikamimageplugin_adjustlevels.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_adjustlevels.la kde_module_LTLIBRARIES = digikamimageplugin_adjustlevels.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_adjustlevels_ui.rc rc_DATA = digikamimageplugin_adjustlevels_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_antivignetting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libra
kde_services_DATA = digikamimageplugin_antivignetting.desktop kde_services_DATA = digikamimageplugin_antivignetting.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_antivignetting.la kde_module_LTLIBRARIES = digikamimageplugin_antivignetting.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_antivignetting_ui.rc rc_DATA = digikamimageplugin_antivignetting_ui.rc

@ -124,7 +124,7 @@ AntiVignettingTool::AntiVignettingTool(TQObject* parent)
"half-diagonal measure of the image, at which the density of the filter falls " "half-diagonal measure of the image, at which the density of the filter falls "
"to zero.")); "to zero."));
KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); KSeparator *line = new KSeparator(Horizontal, m_gboxSettings->plainPage());
// ------------------------------------------------------------- // -------------------------------------------------------------

@ -134,7 +134,7 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* parent)
gridSettings->addMultiCellWidget(label3, 5, 5, 0, 2); gridSettings->addMultiCellWidget(label3, 5, 5, 0, 2);
gridSettings->addMultiCellWidget(m_radiusInput, 6, 6, 0, 2); gridSettings->addMultiCellWidget(m_radiusInput, 6, 6, 0, 2);
KSeparator *line = new KSeparator(Qt::Horizontal, gboxSettings); KSeparator *line = new KSeparator(Horizontal, gboxSettings);
gridSettings->addMultiCellWidget(line, 7, 7, 0, 2); gridSettings->addMultiCellWidget(line, 7, 7, 0, 2);
// ------------------------------------------------------------- // -------------------------------------------------------------

@ -27,7 +27,7 @@ digikamimageplugin_blurfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -l
kde_services_DATA = digikamimageplugin_blurfx.desktop kde_services_DATA = digikamimageplugin_blurfx.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_blurfx.la kde_module_LTLIBRARIES = digikamimageplugin_blurfx.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_blurfx_ui.rc rc_DATA = digikamimageplugin_blurfx_ui.rc

@ -28,7 +28,7 @@ digikamimageplugin_border_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -l
kde_services_DATA = digikamimageplugin_border.desktop kde_services_DATA = digikamimageplugin_border.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_border.la kde_module_LTLIBRARIES = digikamimageplugin_border.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_border_ui.rc rc_DATA = digikamimageplugin_border_ui.rc

@ -108,7 +108,7 @@ BorderTool::BorderTool(TQObject* parent)
m_borderType->setDefaultItem(Border::SolidBorder); m_borderType->setDefaultItem(Border::SolidBorder);
TQWhatsThis::add( m_borderType, i18n("<p>Select the border type to add around the image.")); TQWhatsThis::add( m_borderType, i18n("<p>Select the border type to add around the image."));
KSeparator *line1 = new KSeparatorQt::Horizontal, m_gboxSettings->plainPage()); KSeparator *line1 = new KSeparator(Horizontal, m_gboxSettings->plainPage());
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -139,7 +139,7 @@ BorderTool::BorderTool(TQObject* parent)
else else
m_borderWidth->setRange(1, w/2, 1); m_borderWidth->setRange(1, w/2, 1);
KSeparator *line2 = new KSeparatorQt::Horizontal, m_gboxSettings->plainPage()); KSeparator *line2 = new KSeparator(Horizontal, m_gboxSettings->plainPage());
// ------------------------------------------------------------------- // -------------------------------------------------------------------

@ -114,7 +114,7 @@ ImageEffect_Border::ImageEffect_Border(TQWidget* parent)
m_borderType->insertItem( i18n("Decorative Wall") ); m_borderType->insertItem( i18n("Decorative Wall") );
TQWhatsThis::add( m_borderType, i18n("<p>Select the border type to add around the image.")); TQWhatsThis::add( m_borderType, i18n("<p>Select the border type to add around the image."));
KSeparator *line1 = new KSeparatorQt::Horizontal, gboxSettings); KSeparator *line1 = new KSeparator(Horizontal, gboxSettings);
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -143,7 +143,7 @@ ImageEffect_Border::ImageEffect_Border(TQWidget* parent)
else else
m_borderWidth->setRange(1, w/2, 1, true); m_borderWidth->setRange(1, w/2, 1, true);
KSeparator *line2 = new KSeparatorQt::Horizontal, gboxSettings); KSeparator *line2 = new KSeparator(Horizontal, gboxSettings);
// ------------------------------------------------------------------- // -------------------------------------------------------------------

@ -27,7 +27,7 @@ digikamimageplugin_channelmixer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari
kde_services_DATA = digikamimageplugin_channelmixer.desktop kde_services_DATA = digikamimageplugin_channelmixer.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_channelmixer.la kde_module_LTLIBRARIES = digikamimageplugin_channelmixer.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_channelmixer_ui.rc rc_DATA = digikamimageplugin_channelmixer_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_charcoal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = digikamimageplugin_charcoal.desktop kde_services_DATA = digikamimageplugin_charcoal.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_charcoal.la kde_module_LTLIBRARIES = digikamimageplugin_charcoal.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_charcoal_ui.rc rc_DATA = digikamimageplugin_charcoal_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_colorfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -
kde_services_DATA = digikamimageplugin_colorfx.desktop kde_services_DATA = digikamimageplugin_colorfx.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_colorfx.la kde_module_LTLIBRARIES = digikamimageplugin_colorfx.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_colorfx_ui.rc rc_DATA = digikamimageplugin_colorfx_ui.rc

@ -46,7 +46,7 @@ digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltd
kde_services_DATA = digikamimageplugin_core.desktop kde_services_DATA = digikamimageplugin_core.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_core.la kde_module_LTLIBRARIES = digikamimageplugin_core.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_core_ui.rc rc_DATA = digikamimageplugin_core_ui.rc

@ -359,8 +359,8 @@ void ImageEffect_RatioCrop::readSettings()
m_goldenSpiralSectionBox->setChecked( config->readBoolEntry("Golden Spiral Section", false) ); m_goldenSpiralSectionBox->setChecked( config->readBoolEntry("Golden Spiral Section", false) );
m_goldenSpiralBox->setChecked( config->readBoolEntry("Golden Spiral", false) ); m_goldenSpiralBox->setChecked( config->readBoolEntry("Golden Spiral", false) );
m_goldenTriangleBox->setChecked( config->readBoolEntry("Golden Triangle", false) ); m_goldenTriangleBox->setChecked( config->readBoolEntry("Golden Triangle", false) );
m_flipHorBox->setChecked( config->readBoolEntry("Golden FlipQt::Horizontal", false) ); m_flipHorBox->setChecked( config->readBoolEntry("Golden Flip Horizontal", false) );
m_flipVerBox->setChecked( config->readBoolEntry("Golden FlipQt::Vertical", false) ); m_flipVerBox->setChecked( config->readBoolEntry("Golden Flip Vertical", false) );
m_guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor)); m_guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor));
m_guideSize->setValue(config->readNumEntry("Guide Width", 1)); m_guideSize->setValue(config->readNumEntry("Guide Width", 1));
m_imageSelectionWidget->slotGuideLines(m_guideLinesCB->currentItem()); m_imageSelectionWidget->slotGuideLines(m_guideLinesCB->currentItem());
@ -459,8 +459,8 @@ void ImageEffect_RatioCrop::writeSettings()
config->writeEntry( "Golden Spiral Section", m_goldenSpiralSectionBox->isChecked() ); config->writeEntry( "Golden Spiral Section", m_goldenSpiralSectionBox->isChecked() );
config->writeEntry( "Golden Spiral", m_goldenSpiralBox->isChecked() ); config->writeEntry( "Golden Spiral", m_goldenSpiralBox->isChecked() );
config->writeEntry( "Golden Triangle", m_goldenTriangleBox->isChecked() ); config->writeEntry( "Golden Triangle", m_goldenTriangleBox->isChecked() );
config->writeEntry( "Golden FlipQt::Horizontal", m_flipHorBox->isChecked() ); config->writeEntry( "Golden Flip Horizontal", m_flipHorBox->isChecked() );
config->writeEntry( "Golden FlipQt::Vertical", m_flipVerBox->isChecked() ); config->writeEntry( "Golden Flip Vertical", m_flipVerBox->isChecked() );
config->writeEntry( "Guide Color", m_guideColorBt->color() ); config->writeEntry( "Guide Color", m_guideColorBt->color() );
config->writeEntry( "Guide Width", m_guideSize->value() ); config->writeEntry( "Guide Width", m_guideSize->value() );
config->sync(); config->sync();

@ -407,8 +407,8 @@ void RatioCropTool::readSettings()
m_goldenSpiralSectionBox->setChecked(config->readBoolEntry("Golden Spiral Section", false)); m_goldenSpiralSectionBox->setChecked(config->readBoolEntry("Golden Spiral Section", false));
m_goldenSpiralBox->setChecked(config->readBoolEntry("Golden Spiral", false)); m_goldenSpiralBox->setChecked(config->readBoolEntry("Golden Spiral", false));
m_goldenTriangleBox->setChecked(config->readBoolEntry("Golden Triangle", false)); m_goldenTriangleBox->setChecked(config->readBoolEntry("Golden Triangle", false));
m_flipHorBox->setChecked(config->readBoolEntry("Golden FlipQt::Horizontal", false)); m_flipHorBox->setChecked(config->readBoolEntry("Golden Flip Horizontal", false));
m_flipVerBox->setChecked(config->readBoolEntry("Golden FlipQt::Vertical", false)); m_flipVerBox->setChecked(config->readBoolEntry("Golden Flip Vertical", false));
m_guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor)); m_guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor));
m_guideSize->setValue(config->readNumEntry("Guide Width", m_guideSize->defaultValue())); m_guideSize->setValue(config->readNumEntry("Guide Width", m_guideSize->defaultValue()));
m_imageSelectionWidget->slotGuideLines(m_guideLinesCB->currentItem()); m_imageSelectionWidget->slotGuideLines(m_guideLinesCB->currentItem());
@ -497,8 +497,8 @@ void RatioCropTool::writeSettings()
config->writeEntry("Golden Spiral Section", m_goldenSpiralSectionBox->isChecked()); config->writeEntry("Golden Spiral Section", m_goldenSpiralSectionBox->isChecked());
config->writeEntry("Golden Spiral", m_goldenSpiralBox->isChecked()); config->writeEntry("Golden Spiral", m_goldenSpiralBox->isChecked());
config->writeEntry("Golden Triangle", m_goldenTriangleBox->isChecked()); config->writeEntry("Golden Triangle", m_goldenTriangleBox->isChecked());
config->writeEntry("Golden FlipQt::Horizontal", m_flipHorBox->isChecked()); config->writeEntry("Golden Flip Horizontal", m_flipHorBox->isChecked());
config->writeEntry("Golden FlipQt::Vertical", m_flipVerBox->isChecked()); config->writeEntry("Golden Flip Vertical", m_flipVerBox->isChecked());
config->writeEntry("Guide Color", m_guideColorBt->color()); config->writeEntry("Guide Color", m_guideColorBt->color());
config->writeEntry("Guide Width", m_guideSize->value()); config->writeEntry("Guide Width", m_guideSize->value());
config->sync(); config->sync();

@ -27,7 +27,7 @@ digikamimageplugin_distortionfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari
kde_services_DATA = digikamimageplugin_distortionfx.desktop kde_services_DATA = digikamimageplugin_distortionfx.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_distortionfx.la kde_module_LTLIBRARIES = digikamimageplugin_distortionfx.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_distortionfx_ui.rc rc_DATA = digikamimageplugin_distortionfx_ui.rc

@ -360,8 +360,8 @@ void DistortionFX::twirl(Digikam::DImg *orgImage, Digikam::DImg *destImage, int
* Width => Width of image. * Width => Width of image.
* Height => Height of image. * Height => Height of image.
* Coeff => Cilindrical value. * Coeff => Cilindrical value.
*Qt::Horizontal => Apply horizontally. * Horizontal => Apply horizontally.
*Qt::Vertical => Apply vertically. * Vertical => Apply vertically.
* Antialias => Smart bluring result. * Antialias => Smart bluring result.
* *
* Theory => This is a great effect, similar to Spherize (Photoshop). * Theory => This is a great effect, similar to Spherize (Photoshop).
@ -371,10 +371,10 @@ void DistortionFX::twirl(Digikam::DImg *orgImage, Digikam::DImg *destImage, int
* environment. * environment.
*/ */
void DistortionFX::cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage, double Coeff, void DistortionFX::cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage, double Coeff,
boolQt::Horizontal, boolQt::Vertical, bool AntiAlias) bool Horizontal, bool Vertical, bool AntiAlias)
{ {
if ((Coeff == 0.0) || (! Qt::Horizontal ||Qt::Vertical))) if ((Coeff == 0.0) || (! (Horizontal || Vertical)))
return; return;
int Width = orgImage->width(); int Width = orgImage->width();
@ -392,9 +392,9 @@ void DistortionFX::cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage
int nHalfW = Width / 2, nHalfH = Height / 2; int nHalfW = Width / 2, nHalfH = Height / 2;
double lfCoeffX = 1.0, lfCoeffY = 1.0, lfCoeffStep = Coeff / 1000.0; double lfCoeffX = 1.0, lfCoeffY = 1.0, lfCoeffStep = Coeff / 1000.0;
if Qt::Horizontal) if (Horizontal)
lfCoeffX = (double)nHalfW / log (fabs (lfCoeffStep) * nHalfW + 1.0); lfCoeffX = (double)nHalfW / log (fabs (lfCoeffStep) * nHalfW + 1.0);
if Qt::Vertical) if (Vertical)
lfCoeffY = (double)nHalfH / log (fabs (lfCoeffStep) * nHalfH + 1.0); lfCoeffY = (double)nHalfH / log (fabs (lfCoeffStep) * nHalfH + 1.0);
// initial copy // initial copy
@ -410,7 +410,7 @@ void DistortionFX::cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage
nh = fabs ((double)(h - nHalfH)); nh = fabs ((double)(h - nHalfH));
nw = fabs ((double)(w - nHalfW)); nw = fabs ((double)(w - nHalfW));
if Qt::Horizontal) if (Horizontal)
{ {
if (Coeff > 0.0) if (Coeff > 0.0)
nw = (exp (nw / lfCoeffX) - 1.0) / lfCoeffStep; nw = (exp (nw / lfCoeffX) - 1.0) / lfCoeffStep;
@ -418,7 +418,7 @@ void DistortionFX::cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage
nw = lfCoeffX * log (1.0 + (-1.0 * lfCoeffStep) * nw); nw = lfCoeffX * log (1.0 + (-1.0 * lfCoeffStep) * nw);
} }
if Qt::Vertical) if (Vertical)
{ {
if (Coeff > 0.0) if (Coeff > 0.0)
nh = (exp (nh / lfCoeffY) - 1.0) / lfCoeffStep; nh = (exp (nh / lfCoeffY) - 1.0) / lfCoeffStep;
@ -657,7 +657,7 @@ void DistortionFX::circularWaves(Digikam::DImg *orgImage, Digikam::DImg *destIma
* Amplitude => Sinoidal maximum height. * Amplitude => Sinoidal maximum height.
* Frequency => Frequency value. * Frequency => Frequency value.
* FillSides => Like a boolean variable. * FillSides => Like a boolean variable.
* Direction =>Qt::Vertical or horizontal flag. * Direction => Vertical or horizontal flag.
* *
* Theory => This is an amazing effect, very funny, and very simple to * Theory => This is an amazing effect, very funny, and very simple to
* understand. You just need understand how sin and cos works. * understand. You just need understand how sin and cos works.
@ -675,7 +675,7 @@ void DistortionFX::waves(Digikam::DImg *orgImage, Digikam::DImg *destImage,
int progress; int progress;
int h, w; int h, w;
if (Direction) //Qt::Horizontal if (Direction) // Horizontal
{ {
int tx; int tx;

@ -79,7 +79,7 @@ private:
void fisheye(Digikam::DImg *orgImage, Digikam::DImg *destImage, double Coeff, bool AntiAlias=true); void fisheye(Digikam::DImg *orgImage, Digikam::DImg *destImage, double Coeff, bool AntiAlias=true);
void twirl(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Twirl, bool AntiAlias=true); void twirl(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Twirl, bool AntiAlias=true);
void cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage, double Coeff, void cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage, double Coeff,
boolQt::Horizontal, boolQt::Vertical, bool AntiAlias=true); bool Horizontal, bool Vertical, bool AntiAlias=true);
void multipleCorners(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Factor, bool AntiAlias=true); void multipleCorners(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Factor, bool AntiAlias=true);
void polarCoordinates(Digikam::DImg *orgImage, Digikam::DImg *destImage, bool Type, bool AntiAlias=true); void polarCoordinates(Digikam::DImg *orgImage, Digikam::DImg *destImage, bool Type, bool AntiAlias=true);
void circularWaves(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, int Y, double Amplitude, void circularWaves(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, int Y, double Amplitude,

@ -122,8 +122,8 @@ DistortionFXTool::DistortionFXTool(TQObject* parent)
"and horizontal.<p>" "and horizontal.<p>"
"<b>Caricature</b>: distorts the photograph with the 'Fish Eyes' effect inverted.<p>" "<b>Caricature</b>: distorts the photograph with the 'Fish Eyes' effect inverted.<p>"
"<b>Multiple Corners</b>: splits the photograph like a multiple corners pattern.<p>" "<b>Multiple Corners</b>: splits the photograph like a multiple corners pattern.<p>"
"<b>WavesQt::Horizontal</b>: distorts the photograph with horizontal waves.<p>" "<b>Waves Horizontal</b>: distorts the photograph with horizontal waves.<p>"
"<b>WavesQt::Vertical</b>: distorts the photograph with vertical waves.<p>" "<b>Waves Vertical</b>: distorts the photograph with vertical waves.<p>"
"<b>Block Waves 1</b>: divides the image into cells and makes it look as " "<b>Block Waves 1</b>: divides the image into cells and makes it look as "
"if it is being viewed through glass blocks.<p>" "if it is being viewed through glass blocks.<p>"
"<b>Block Waves 2</b>: like Block Waves 1 but with another version " "<b>Block Waves 2</b>: like Block Waves 1 but with another version "

@ -126,8 +126,8 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* parent)
"and horizontal.<p>" "and horizontal.<p>"
"<b>Caricature</b>: distorts the photograph with the 'Fish Eyes' effect inverted.<p>" "<b>Caricature</b>: distorts the photograph with the 'Fish Eyes' effect inverted.<p>"
"<b>Multiple Corners</b>: splits the photograph like a multiple corners pattern.<p>" "<b>Multiple Corners</b>: splits the photograph like a multiple corners pattern.<p>"
"<b>WavesQt::Horizontal</b>: distorts the photograph with horizontal waves.<p>" "<b>WavesQt Horizontal</b>: distorts the photograph with horizontal waves.<p>"
"<b>WavesQt::Vertical</b>: distorts the photograph with vertical waves.<p>" "<b>Waves Vertical</b>: distorts the photograph with vertical waves.<p>"
"<b>Block Waves 1</b>: divides the image into cells and makes it look as " "<b>Block Waves 1</b>: divides the image into cells and makes it look as "
"if it is being viewed through glass blocks.<p>" "if it is being viewed through glass blocks.<p>"
"<b>Block Waves 2</b>: like Block Waves 1 but with another version " "<b>Block Waves 2</b>: like Block Waves 1 but with another version "

@ -27,7 +27,7 @@ digikamimageplugin_emboss_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -l
kde_services_DATA = digikamimageplugin_emboss.desktop kde_services_DATA = digikamimageplugin_emboss.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_emboss.la kde_module_LTLIBRARIES = digikamimageplugin_emboss.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_emboss_ui.rc rc_DATA = digikamimageplugin_emboss_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_filmgrain_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = digikamimageplugin_filmgrain.desktop kde_services_DATA = digikamimageplugin_filmgrain.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_filmgrain.la kde_module_LTLIBRARIES = digikamimageplugin_filmgrain.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_filmgrain_ui.rc rc_DATA = digikamimageplugin_filmgrain_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_freerotation_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari
kde_services_DATA = digikamimageplugin_freerotation.desktop kde_services_DATA = digikamimageplugin_freerotation.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_freerotation.la kde_module_LTLIBRARIES = digikamimageplugin_freerotation.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_freerotation_ui.rc rc_DATA = digikamimageplugin_freerotation_ui.rc

@ -101,7 +101,7 @@ FreeRotationTool::FreeRotationTool(TQObject* parent)
m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage()); m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage());
m_newHeightLabel->setAlignment( AlignBottom | AlignRight ); m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); KSeparator *line = new KSeparator(Horizontal, m_gboxSettings->plainPage());
TQLabel *label3 = new TQLabel(i18n("Main angle:"), m_gboxSettings->plainPage()); TQLabel *label3 = new TQLabel(i18n("Main angle:"), m_gboxSettings->plainPage());
m_angleInput = new RIntNumInput(m_gboxSettings->plainPage()); m_angleInput = new RIntNumInput(m_gboxSettings->plainPage());

@ -112,7 +112,7 @@ ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* parent)
gridSettings->addMultiCellWidget(label2, 1, 1, 0, 0); gridSettings->addMultiCellWidget(label2, 1, 1, 0, 0);
gridSettings->addMultiCellWidget(m_newHeightLabel, 1, 1, 1, 2); gridSettings->addMultiCellWidget(m_newHeightLabel, 1, 1, 1, 2);
KSeparator *line = new KSeparator(Qt::Horizontal, gboxSettings); KSeparator *line = new KSeparator(Horizontal, gboxSettings);
gridSettings->addMultiCellWidget(line, 2, 2, 0, 2); gridSettings->addMultiCellWidget(line, 2, 2, 0, 2);
TQLabel *label3 = new TQLabel(i18n("Main angle:"), gboxSettings); TQLabel *label3 = new TQLabel(i18n("Main angle:"), gboxSettings);

@ -29,7 +29,7 @@ digikamimageplugin_hotpixels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = digikamimageplugin_hotpixels.desktop kde_services_DATA = digikamimageplugin_hotpixels.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_hotpixels.la kde_module_LTLIBRARIES = digikamimageplugin_hotpixels.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_hotpixels_ui.rc rc_DATA = digikamimageplugin_hotpixels_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_infrared_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = digikamimageplugin_infrared.desktop kde_services_DATA = digikamimageplugin_infrared.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_infrared.la kde_module_LTLIBRARIES = digikamimageplugin_infrared.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_infrared_ui.rc rc_DATA = digikamimageplugin_infrared_ui.rc

@ -28,7 +28,7 @@ digikamimageplugin_inpainting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries
kde_services_DATA = digikamimageplugin_inpainting.desktop kde_services_DATA = digikamimageplugin_inpainting.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_inpainting.la kde_module_LTLIBRARIES = digikamimageplugin_inpainting.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_inpainting_ui.rc rc_DATA = digikamimageplugin_inpainting_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_inserttext_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries
kde_services_DATA = digikamimageplugin_inserttext.desktop kde_services_DATA = digikamimageplugin_inserttext.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_inserttext.la kde_module_LTLIBRARIES = digikamimageplugin_inserttext.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_inserttext_ui.rc rc_DATA = digikamimageplugin_inserttext_ui.rc

@ -28,7 +28,7 @@ digikamimageplugin_lensdistortion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libra
kde_services_DATA = digikamimageplugin_lensdistortion.desktop kde_services_DATA = digikamimageplugin_lensdistortion.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_lensdistortion.la kde_module_LTLIBRARIES = digikamimageplugin_lensdistortion.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_lensdistortion_ui.rc rc_DATA = digikamimageplugin_lensdistortion_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_noisereduction_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libra
kde_services_DATA = digikamimageplugin_noisereduction.desktop kde_services_DATA = digikamimageplugin_noisereduction.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_noisereduction.la kde_module_LTLIBRARIES = digikamimageplugin_noisereduction.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_noisereduction_ui.rc rc_DATA = digikamimageplugin_noisereduction_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_oilpaint_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = digikamimageplugin_oilpaint.desktop kde_services_DATA = digikamimageplugin_oilpaint.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_oilpaint.la kde_module_LTLIBRARIES = digikamimageplugin_oilpaint.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_oilpaint_ui.rc rc_DATA = digikamimageplugin_oilpaint_ui.rc

@ -28,7 +28,7 @@ digikamimageplugin_perspective_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librarie
kde_services_DATA = digikamimageplugin_perspective.desktop kde_services_DATA = digikamimageplugin_perspective.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_perspective.la kde_module_LTLIBRARIES = digikamimageplugin_perspective.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_perspective_ui.rc rc_DATA = digikamimageplugin_perspective_ui.rc

@ -121,7 +121,7 @@ ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* parent)
// ------------------------------------------------------------- // -------------------------------------------------------------
KSeparator *line = new KSeparator(Qt::Horizontal, gbox2); KSeparator *line = new KSeparator(Horizontal, gbox2);
TQLabel *angleLabel = new TQLabel(i18n("Angles (in degrees):"), gbox2); TQLabel *angleLabel = new TQLabel(i18n("Angles (in degrees):"), gbox2);
TQLabel *label3 = new TQLabel(i18n(" Top left:"), gbox2); TQLabel *label3 = new TQLabel(i18n(" Top left:"), gbox2);
@ -146,7 +146,7 @@ ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* parent)
// ------------------------------------------------------------- // -------------------------------------------------------------
KSeparator *line2 = new KSeparator(Qt::Horizontal, gbox2); KSeparator *line2 = new KSeparator(Horizontal, gbox2);
m_drawWhileMovingCheckBox = new TQCheckBox(i18n("Draw preview while moving"), gbox2); m_drawWhileMovingCheckBox = new TQCheckBox(i18n("Draw preview while moving"), gbox2);
gridLayout->addMultiCellWidget(line2, 8, 8, 0, 2); gridLayout->addMultiCellWidget(line2, 8, 8, 0, 2);

@ -107,7 +107,7 @@ PerspectiveTool::PerspectiveTool(TQObject* parent)
// ------------------------------------------------------------- // -------------------------------------------------------------
KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); KSeparator *line = new KSeparator(Horizontal, m_gboxSettings->plainPage());
TQLabel *angleLabel = new TQLabel(i18n("Angles (in degrees):"), m_gboxSettings->plainPage()); TQLabel *angleLabel = new TQLabel(i18n("Angles (in degrees):"), m_gboxSettings->plainPage());
TQLabel *label3 = new TQLabel(i18n(" Top left:"), m_gboxSettings->plainPage()); TQLabel *label3 = new TQLabel(i18n(" Top left:"), m_gboxSettings->plainPage());
@ -121,7 +121,7 @@ PerspectiveTool::PerspectiveTool(TQObject* parent)
// ------------------------------------------------------------- // -------------------------------------------------------------
KSeparator *line2 = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); KSeparator *line2 = new KSeparator(Horizontal, m_gboxSettings->plainPage());
m_drawWhileMovingCheckBox = new TQCheckBox(i18n("Draw preview while moving"), m_gboxSettings->plainPage()); m_drawWhileMovingCheckBox = new TQCheckBox(i18n("Draw preview while moving"), m_gboxSettings->plainPage());
gridLayout->addMultiCellWidget(line2, 8, 8, 0, 2); gridLayout->addMultiCellWidget(line2, 8, 8, 0, 2);

@ -259,11 +259,11 @@ void PerspectiveWidget::updatePixmap(void)
{ {
int j = i*4; int j = i*4;
//Qt::Horizontal line. //Horizontal line.
m_grid.setPoint(j , 0, i*gYS); m_grid.setPoint(j , 0, i*gYS);
m_grid.setPoint(j+1, m_w, i*gYS); m_grid.setPoint(j+1, m_w, i*gYS);
//Qt::Vertical line. //Vertical line.
m_grid.setPoint(j+2, i*gXS, 0); m_grid.setPoint(j+2, i*gXS, 0);
m_grid.setPoint(j+3, i*gXS, m_h); m_grid.setPoint(j+3, i*gXS, m_h);
} }
@ -324,10 +324,10 @@ void PerspectiveWidget::updatePixmap(void)
{ {
for (uint i = 0 ; i < m_grid.size() ; i += 4) for (uint i = 0 ; i < m_grid.size() ; i += 4)
{ {
//Qt::Horizontal line. //Horizontal line.
p.drawLine(m_grid.point(i)+m_rect.topLeft(), m_grid.point(i+1)+m_rect.topLeft()); p.drawLine(m_grid.point(i)+m_rect.topLeft(), m_grid.point(i+1)+m_rect.topLeft());
//Qt::Vertical line. //Vertical line.
p.drawLine(m_grid.point(i+2)+m_rect.topLeft(), m_grid.point(i+3)+m_rect.topLeft()); p.drawLine(m_grid.point(i+2)+m_rect.topLeft(), m_grid.point(i+3)+m_rect.topLeft());
} }
} }

@ -27,7 +27,7 @@ digikamimageplugin_raindrop_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = digikamimageplugin_raindrop.desktop kde_services_DATA = digikamimageplugin_raindrop.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_raindrop.la kde_module_LTLIBRARIES = digikamimageplugin_raindrop.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_raindrop_ui.rc rc_DATA = digikamimageplugin_raindrop_ui.rc

@ -28,7 +28,7 @@ digikamimageplugin_restoration_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librarie
kde_services_DATA = digikamimageplugin_restoration.desktop kde_services_DATA = digikamimageplugin_restoration.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_restoration.la kde_module_LTLIBRARIES = digikamimageplugin_restoration.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_restoration_ui.rc rc_DATA = digikamimageplugin_restoration_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_sheartool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = digikamimageplugin_sheartool.desktop kde_services_DATA = digikamimageplugin_sheartool.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_sheartool.la kde_module_LTLIBRARIES = digikamimageplugin_sheartool.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_sheartool_ui.rc rc_DATA = digikamimageplugin_sheartool_ui.rc

@ -112,7 +112,7 @@ ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* parent)
gridSettings->addMultiCellWidget(label2, 1, 1, 0, 0); gridSettings->addMultiCellWidget(label2, 1, 1, 0, 0);
gridSettings->addMultiCellWidget(m_newHeightLabel, 1, 1, 1, 2); gridSettings->addMultiCellWidget(m_newHeightLabel, 1, 1, 1, 2);
KSeparator *line = new KSeparator(Qt::Horizontal, gboxSettings); KSeparator *line = new KSeparator(Horizontal, gboxSettings);
gridSettings->addMultiCellWidget(line, 2, 2, 0, 2); gridSettings->addMultiCellWidget(line, 2, 2, 0, 2);
TQLabel *label3 = new TQLabel(i18n("Main horizontal angle:"), gboxSettings); TQLabel *label3 = new TQLabel(i18n("Main horizontal angle:"), gboxSettings);

@ -99,7 +99,7 @@ ShearTool::ShearTool(TQObject* parent)
m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage()); m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage());
m_newHeightLabel->setAlignment( AlignBottom | AlignRight ); m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); KSeparator *line = new KSeparator(Horizontal, m_gboxSettings->plainPage());
TQLabel *label3 = new TQLabel(i18n("Main horizontal angle:"), m_gboxSettings->plainPage()); TQLabel *label3 = new TQLabel(i18n("Main horizontal angle:"), m_gboxSettings->plainPage());
m_mainHAngleInput = new RIntNumInput(m_gboxSettings->plainPage()); m_mainHAngleInput = new RIntNumInput(m_gboxSettings->plainPage());

@ -29,7 +29,7 @@ digikamimageplugin_superimpose_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librarie
kde_services_DATA = digikamimageplugin_superimpose.desktop kde_services_DATA = digikamimageplugin_superimpose.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_superimpose.la kde_module_LTLIBRARIES = digikamimageplugin_superimpose.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_superimpose_ui.rc rc_DATA = digikamimageplugin_superimpose_ui.rc

@ -28,7 +28,7 @@ digikamimageplugin_texture_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -
kde_services_DATA = digikamimageplugin_texture.desktop kde_services_DATA = digikamimageplugin_texture.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_texture.la kde_module_LTLIBRARIES = digikamimageplugin_texture.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_texture_ui.rc rc_DATA = digikamimageplugin_texture_ui.rc

@ -27,7 +27,7 @@ digikamimageplugin_whitebalance_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_librari
kde_services_DATA = digikamimageplugin_whitebalance.desktop kde_services_DATA = digikamimageplugin_whitebalance.desktop
#kde_module_LTLIBRARIES = digikamimageplugin_whitebalance.la kde_module_LTLIBRARIES = digikamimageplugin_whitebalance.la
rcdir = $(kde_datadir)/digikam rcdir = $(kde_datadir)/digikam
rc_DATA = digikamimageplugin_whitebalance_ui.rc rc_DATA = digikamimageplugin_whitebalance_ui.rc

@ -238,7 +238,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
"image used to set white color balance temperature and " "image used to set white color balance temperature and "
"green component.")); "green component."));
KSeparator *line = new KSeparator(Qt::Horizontal, gboxSettings); KSeparator *line = new KSeparator(Horizontal, gboxSettings);
// ------------------------------------------------------------- // -------------------------------------------------------------
@ -273,7 +273,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
TQWhatsThis::add(m_greenInput, i18n("<p>Set here the green component to set magenta color " TQWhatsThis::add(m_greenInput, i18n("<p>Set here the green component to set magenta color "
"cast removal level.")); "cast removal level."));
KSeparator *line2 = new KSeparator(Qt::Horizontal, gboxSettings); KSeparator *line2 = new KSeparator(Horizontal, gboxSettings);
// ------------------------------------------------------------- // -------------------------------------------------------------

@ -237,7 +237,7 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
"image used to set white color balance temperature and " "image used to set white color balance temperature and "
"green component.")); "green component."));
KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); KSeparator *line = new KSeparator(Horizontal, m_gboxSettings->plainPage());
// ------------------------------------------------------------- // -------------------------------------------------------------
@ -277,7 +277,7 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
TQWhatsThis::add(m_greenInput, i18n("<p>Set here the green component to set magenta color " TQWhatsThis::add(m_greenInput, i18n("<p>Set here the green component to set magenta color "
"cast removal level.")); "cast removal level."));
KSeparator *line2 = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); KSeparator *line2 = new KSeparator(Horizontal, m_gboxSettings->plainPage());
// ------------------------------------------------------------- // -------------------------------------------------------------

Loading…
Cancel
Save