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.
(cherry picked from commit ba22066e52)
v3.5.13-sru
Darrell Anderson 13 years ago committed by Slávek Banko
parent 6df73ed559
commit 1742ec3385

@ -20,8 +20,8 @@
*
* ============================================================ */
#ifndef ACTQUIREIMAGEDIALOG_H
#define ACTQUIREIMAGEDIALOG_H
#ifndef ACQUIREIMAGEDIALOG_H
#define ACQUIREIMAGEDIALOG_H
// Include files for TQt
@ -129,4 +129,4 @@ private:
} // NameSpace KIPIAcquireImagesPlugin
#endif // ACTQUIREIMAGEDIALOG_H
#endif // ACQUIREIMAGEDIALOG_H

@ -20,8 +20,8 @@
*
* ============================================================ */
#ifndef PLUGIN_ACTQUIREIMAGES_H
#define PLUGIN_ACTQUIREIMAGES_H
#ifndef PLUGIN_ACQUIREIMAGES_H
#define PLUGIN_ACQUIREIMAGES_H
// LibKIPI includes.
@ -60,4 +60,4 @@ private:
KIPIAcquireImagesPlugin::ScreenGrabDialog *m_screenshotDialog;
};
#endif /* PLUGIN_ACTQUIREIMAGES_H */
#endif /* PLUGIN_ACQUIREIMAGES_H */

@ -344,14 +344,14 @@ TQString ResizeImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem
// Get the target image resizing dimensions with using the target size.
if ( m_Width < m_Height ) //Qt::Vertically resizing
if ( m_Width < m_Height ) //Vertically resizing
{
if ( w < h ) // Original size vertically oriented.
ResizeCoeff = m_Height;
else // Original size horizontally oriented.
ResizeCoeff = m_Width;
}
else //Qt::Horizontally resizing
else //Horizontally resizing
{
if ( w < h ) // Original size vertically oriented.
ResizeCoeff = m_Height;

@ -70,7 +70,7 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
TQVBoxLayout* flickrWidgetLayout = new TQVBoxLayout(this, 5, 5);
m_photoView = 0; //new KHTMLPart(splitter);
KSeparator *line = new KSeparator(Qt::Horizontal, this);
KSeparator *line = new KSeparator(Horizontal, this);
m_tab = new KTabWidget(this);
KActiveLabel *headerLabel = new KActiveLabel(this);
headerLabel->setFocusPolicy(TQ_NoFocus);

@ -153,7 +153,7 @@ GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent)
TQLabel *gpxFileLabel = new TQLabel(i18n("Current GPX file:"), settingsBox);
d->gpxFileName = new KSqueezedTextLabel(i18n("No GPX file"), settingsBox);
d->gpxPointsLabel = new TQLabel(settingsBox);
KSeparator *line = new KSeparator(Qt::Horizontal, settingsBox);
KSeparator *line = new KSeparator(Horizontal, settingsBox);
TQLabel *maxGapLabel = new TQLabel(i18n("Max. time gap (sec.):"), settingsBox);
d->maxGapInput = new KIntSpinBox(0, 1000000, 1, 30, 10, settingsBox);

@ -40,7 +40,7 @@ namespace KIPIJPEGLossLessPlugin
* or recompression of the image.
* Thanks to Guido Vollbeding for the initial design and code of this feature.
*
*Qt::Horizontal flipping is done in-place, using a single top-to-bottom
* Horizontal flipping is done in-place, using a single top-to-bottom
* pass through the virtual source array. It will thus be much the
* fastest option for images larger than main memory.
*
@ -75,7 +75,7 @@ namespace KIPIJPEGLossLessPlugin
LOCAL(void)
do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *src_coef_arrays)
/*Qt::Horizontal flip; done in-place, so no separate dest array is required */
/* Horizontal flip; done in-place, so no separate dest array is required */
{
JDIMENSION MCU_cols, comp_width, blk_x, blk_y;
int ci, k, offset_y;
@ -84,7 +84,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
JCOEF temp1, temp2;
jpeg_component_info *compptr;
/*Qt::Horizontal mirroring of DCT blocks is accomplished by swapping
/* Horizontal mirroring of DCT blocks is accomplished by swapping
* pairs of blocks in-place. Within a DCT block, we perform horizontal
* mirroring by changing the signs of odd-numbered columns.
* Partial iMCUs at the right edge are left untouched.
@ -125,7 +125,7 @@ LOCAL(void)
do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *src_coef_arrays,
jvirt_barray_ptr *dst_coef_arrays)
/*Qt::Vertical flip */
/* Vertical flip */
{
JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
int ci, i, j, offset_y;
@ -242,7 +242,7 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *dst_coef_arrays)
/* 90 degree rotation is equivalent to
* 1. Transposing the image;
* 2.Qt::Horizontal mirroring.
* 2. Horizontal mirroring.
* These two steps are merged into a single processing routine.
*/
{
@ -305,7 +305,7 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *src_coef_arrays,
jvirt_barray_ptr *dst_coef_arrays)
/* 270 degree rotation is equivalent to
* 1.Qt::Horizontal mirroring;
* 1. Horizontal mirroring;
* 2. Transposing the image.
* These two steps are merged into a single processing routine.
*/
@ -369,8 +369,8 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *src_coef_arrays,
jvirt_barray_ptr *dst_coef_arrays)
/* 180 degree rotation is equivalent to
* 1.Qt::Vertical mirroring;
* 2.Qt::Horizontal mirroring.
* 1. Vertical mirroring;
* 2. Horizontal mirroring.
* These two steps are merged into a single processing routine.
*/
{
@ -473,9 +473,9 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
* 1. 180 degree rotation;
* 2. Transposition;
* or
* 1.Qt::Horizontal mirroring;
* 1. Horizontal mirroring;
* 2. Transposition;
* 3.Qt::Horizontal mirroring.
* 3. Horizontal mirroring.
* These steps are merged into a single processing routine.
*/
{

@ -109,7 +109,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent)
.arg(KApplication::kApplication()->aboutData()->appName()),
parent);
d->syncIPTCDateCheck = new TQCheckBox(i18n("Sync IPTC creation date"), parent);
KSeparator *line = new KSeparator(Qt::Horizontal, parent);
KSeparator *line = new KSeparator(Horizontal, parent);
grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0);
grid->addMultiCellWidget(d->dateCreatedSubSecCheck, 0, 0, 1, 2);

@ -166,7 +166,7 @@ EXIFDevice::EXIFDevice(TQWidget* parent)
"Makernotes</a></b> can be unreadable if you set "
"wrong device manufacturer/model description.</b>"), parent);
KSeparator *line = new KSeparator(Qt::Horizontal, parent);
KSeparator *line = new KSeparator(Horizontal, parent);
grid->addMultiCellWidget(warning, 3, 3, 0, 5);
grid->addMultiCellWidget(line, 4, 4, 0, 5);
@ -226,7 +226,7 @@ EXIFDevice::EXIFDevice(TQWidget* parent)
TQWhatsThis::add(d->exposureBiasEdit, i18n("<p>Set here the exposure bias value in APEX unit "
"used by camera to take the picture."));
KSeparator *line2 = new KSeparator(Qt::Horizontal, parent);
KSeparator *line2 = new KSeparator(Horizontal, parent);
grid->addMultiCellWidget(line2, 9, 9, 0, 5);
// --------------------------------------------------------

@ -106,7 +106,7 @@ IPTCCaption::IPTCCaption(TQWidget* parent)
.arg(KApplication::kApplication()->aboutData()->appName()),
parent);
d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), parent);
KSeparator *line = new KSeparator(Qt::Horizontal, parent);
KSeparator *line = new KSeparator(Horizontal, parent);
/* d->captionEdit->setValidator(asciiValidator);
d->captionEdit->setMaxLength(2000);*/

@ -117,7 +117,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent)
.arg(KApplication::kApplication()->aboutData()->appName()),
parent);
d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent);
KSeparator *line = new KSeparator(Qt::Horizontal, parent);
KSeparator *line = new KSeparator(Horizontal, parent);
d->dateCreatedSel->setDate(TQDate::currentDate());
d->timeCreatedSel->setTime(TQTime::currentTime());
grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0);

@ -447,7 +447,7 @@ IPTCOrigin::IPTCOrigin(TQWidget* parent)
grid->addMultiCellWidget(d->objectNameEdit, 1, 1, 0, 2);
grid->addMultiCellWidget(d->locationCheck, 2, 2, 0, 0);
grid->addMultiCellWidget(d->locationEdit, 2, 2, 1, 2);
grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, parent), 3, 3, 0, 2);
grid->addMultiCellWidget(new KSeparator(Horizontal, parent), 3, 3, 0, 2);
grid->addMultiCellWidget(d->cityCheck, 4, 4, 0, 0);
grid->addMultiCellWidget(d->cityEdit, 4, 4, 1, 2);
grid->addMultiCellWidget(d->sublocationCheck, 5, 5, 0, 0);
@ -456,7 +456,7 @@ IPTCOrigin::IPTCOrigin(TQWidget* parent)
grid->addMultiCellWidget(d->provinceEdit, 6, 6, 1, 2);
grid->addMultiCellWidget(d->countryCheck, 7, 7, 0, 0);
grid->addMultiCellWidget(d->countryCB, 7, 7, 1, 2);
grid->addMultiCellWidget(new KSeparator(Qt::Horizontal, parent), 8, 8, 0, 2);
grid->addMultiCellWidget(new KSeparator(Horizontal, parent), 8, 8, 0, 2);
grid->addMultiCellWidget(d->originalTransCheck, 9, 9, 0, 2);
grid->addMultiCellWidget(d->originalTransEdit, 10, 10, 0, 2);
grid->addMultiCellWidget(note, 11, 11, 0, 2);

Loading…
Cancel
Save