summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-12-23 02:46:37 +0100
committerSlávek Banko <slavek.banko@axis.cz>2018-12-23 02:59:24 +0100
commit0a1206ac3ddf4dfa51c31d926762f7a097ff949b (patch)
tree6bee1a54b3b1108834d40f4ba6c4125adb46fbe7
parenta3a662599f80e2919c5b7affac653961f7e3e3ec (diff)
downloaddigikam-0a1206ac3ddf4dfa51c31d926762f7a097ff949b.tar.gz
digikam-0a1206ac3ddf4dfa51c31d926762f7a097ff949b.zip
Fix inadvertently renamed Orientation => Qt::Orientation.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 3e9103e67737f858be48108bd92b9862f5f10deb)
-rw-r--r--digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp4
-rw-r--r--digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp4
-rw-r--r--digikam/libs/jpegutils/jpegutils.cpp2
-rw-r--r--digikam/project/NEWS.0.9.04
-rw-r--r--digikam/project/NEWS.0.9.22
-rw-r--r--digikam/utilities/imageeditor/canvas/dimginterface.cpp2
6 files changed, 9 insertions, 9 deletions
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
index 18882fc2..b66f391c 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
@@ -121,7 +121,7 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent)
m_preciseCrop = new TQCheckBox(i18n("Exact"), cropSelection);
TQWhatsThis::add( m_preciseCrop, i18n("<p>Enable this option to force exact aspect ratio crop."));
- m_orientLabel = new TQLabel(i18n("Qt::Orientation:"), cropSelection);
+ m_orientLabel = new TQLabel(i18n("Orientation:"), cropSelection);
m_orientCB = new TQComboBox( false, cropSelection );
m_orientCB->insertItem( i18n("Landscape") );
m_orientCB->insertItem( i18n("Portrait") );
@@ -552,7 +552,7 @@ void ImageEffect_RatioCrop::slotSelectionOrientationChanged(int newOrientation)
setRatioCBText(newOrientation);
- // Change Qt::Orientation ComboBox
+ // Change Orientation ComboBox
m_orientCB->setCurrentItem(newOrientation);
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
index c223ed31..ad49e17c 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
@@ -146,7 +146,7 @@ RatioCropTool::RatioCropTool(TQObject* parent)
m_preciseCrop = new TQCheckBox(i18n("Exact"), cropSelection);
TQWhatsThis::add( m_preciseCrop, i18n("<p>Enable this option to force exact aspect ratio crop."));
- m_orientLabel = new TQLabel(i18n("Qt::Orientation:"), cropSelection);
+ m_orientLabel = new TQLabel(i18n("Orientation:"), cropSelection);
m_orientCB = new RComboBox(cropSelection);
m_orientCB->insertItem( i18n("Landscape"));
m_orientCB->insertItem( i18n("Portrait"));
@@ -592,7 +592,7 @@ void RatioCropTool::slotSelectionOrientationChanged(int newOrientation)
setRatioCBText(newOrientation);
- // Change Qt::Orientation ComboBox
+ // Change Orientation ComboBox
m_orientCB->setCurrentItem(newOrientation);
diff --git a/digikam/libs/jpegutils/jpegutils.cpp b/digikam/libs/jpegutils/jpegutils.cpp
index 44a89c4e..2db34026 100644
--- a/digikam/libs/jpegutils/jpegutils.cpp
+++ b/digikam/libs/jpegutils/jpegutils.cpp
@@ -411,7 +411,7 @@ bool exifRotate(const TQString& file, const TQString& documentName)
// -- Metadata operations ------------------------------------------------------
// Reset the Exif orientation tag of the temp image to normal
- DDebug() << "ExifRotate: set Qt::Orientation tag to normal: " << file << endl;
+ DDebug() << "ExifRotate: set Orientation tag to normal: " << file << endl;
metaData.load(temp);
metaData.setImageOrientation(DMetadata::ORIENTATION_NORMAL);
diff --git a/digikam/project/NEWS.0.9.0 b/digikam/project/NEWS.0.9.0
index 417039f4..ad8e1cb1 100644
--- a/digikam/project/NEWS.0.9.0
+++ b/digikam/project/NEWS.0.9.0
@@ -58,7 +58,7 @@ Showfoto : Thumbbar moved to the left by default in vertical mode. Image pr
right to make a consistant GUI with digiKam main interface.
Showfoto : Thumbbar can be used to the bottom in horizontal mode.
Showfoto : New Exif Auto-rotate option like in digiKam ImageEditor.
-Showfoto : New Set Qt::Orientation Exif flag to normal after Rotate/Flip like in digiKam ImageEditor.
+Showfoto : New Set Orientation Exif flag to normal after Rotate/Flip like in digiKam ImageEditor.
*** 0.9.0-beta2 *******************************************************
@@ -260,7 +260,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b
122 ==> 131301 : Crash after add second image.
123 ==> 109820 : Utility script to export tag information of images into the filesystem.
124 ==> 117375 : Change file name without affecting extension.
-125 ==> 131603 : Qt::Orientation of RAW-images (especially Canons *.cr2).
+125 ==> 131603 : Orientation of RAW-images (especially Canons *.cr2).
126 ==> 131532 : Minolta exception code can break EXIF rotation.
127 ==> 131550 : digiKam/showfoto can't show jpeg image under PowerPC.
128 ==> 131549 : Endianess problem under Linux-PowerPC (with png images at least).
diff --git a/digikam/project/NEWS.0.9.2 b/digikam/project/NEWS.0.9.2
index b0b86919..c7fea69b 100644
--- a/digikam/project/NEWS.0.9.2
+++ b/digikam/project/NEWS.0.9.2
@@ -151,7 +151,7 @@ digiKam BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org):
033 ==> 89365 : More standard menu structure.
034 ==> 144214 : The plural form of "child" is "children", not "childs".
035 ==> 124487 : No way to pause a slide show.
-036 ==> 128975 : "Correct Exif Qt::Orientation Tag" does not change the mtime
+036 ==> 128975 : "Correct Exif Orientation Tag" does not change the mtime
of the image file.
037 ==> 139814 : The window of digiKam exceed the screen if the resolution is 800x600.
038 ==> 144481 :Qt::Vertical window size cannot be reduced to VGA resolution.
diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp
index 4ad6929e..f8a156ba 100644
--- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp
+++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp
@@ -646,7 +646,7 @@ void DImgInterface::saveAs(const TQString& fileName, IOFileSettingsContainer *io
// Update Exif Document Name tag with the original file name.
meta.setExifTagString("Exif.Image.DocumentName", getImageFileName());
- // Update Exif Qt::Orientation tag if necessary.
+ // Update Exif Orientation tag if necessary.
if( setExifOrientationTag )
meta.setImageOrientation(DMetadata::ORIENTATION_NORMAL);