From af0ea06e33ec0c61ec44f279a738efd22263ac17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 3 Aug 2011 18:10:36 +0000 Subject: [PATCH] Fix instances of Orientation in quotes which were accidentally renamed to Qt::Orientation during TQt conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1244690 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- digikam/digikam/albumsettings.cpp | 4 ++-- .../coreplugin/ratiocrop/imageeffect_ratiocrop.cpp | 12 ++++++------ .../coreplugin/ratiocrop/ratiocroptool.cpp | 12 ++++++------ digikam/project/NEWS.0.9.5 | 2 +- digikam/showfoto/setup/setupeditor.cpp | 4 ++-- digikam/showfoto/showfoto.cpp | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/digikam/digikam/albumsettings.cpp b/digikam/digikam/albumsettings.cpp index 5eb7c28..a0acb82 100644 --- a/digikam/digikam/albumsettings.cpp +++ b/digikam/digikam/albumsettings.cpp @@ -333,7 +333,7 @@ void AlbumSettings::readSettings() config->setGroup("EXIF Settings"); d->exifRotate = config->readBoolEntry("EXIF Rotate", true); - d->exifSetOrientation = config->readBoolEntry("EXIF Set Qt::Orientation", true); + d->exifSetOrientation = config->readBoolEntry("EXIF Set Orientation", true); // --------------------------------------------------------------------- @@ -425,7 +425,7 @@ void AlbumSettings::saveSettings() config->setGroup("EXIF Settings"); config->writeEntry("EXIF Rotate", d->exifRotate); - config->writeEntry("EXIF Set Qt::Orientation", d->exifSetOrientation); + config->writeEntry("EXIF Set Orientation", d->exifSetOrientation); // --------------------------------------------------------------------- diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index 19adc06..10d3d7b 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -371,7 +371,7 @@ void ImageEffect_RatioCrop::readSettings() if (m_originalIsLandscape) { - m_orientCB->setCurrentItem( config->readNumEntry("Hor.Oriented Aspect Ratio Qt::Orientation", + m_orientCB->setCurrentItem( config->readNumEntry("Hor.Oriented Aspect Ratio Orientation", ImageSelectionWidget::Landscape) ); m_imageSelectionWidget->setSelectionOrientation(m_orientCB->currentItem()); @@ -395,7 +395,7 @@ void ImageEffect_RatioCrop::readSettings() } else { - m_orientCB->setCurrentItem( config->readNumEntry("Ver.Oriented Aspect Ratio Qt::Orientation", + m_orientCB->setCurrentItem( config->readNumEntry("Ver.Oriented Aspect Ratio Orientation", ImageSelectionWidget::Portrait) ); m_imageSelectionWidget->setSelectionOrientation(m_orientCB->currentItem()); @@ -418,7 +418,7 @@ void ImageEffect_RatioCrop::readSettings() m_heightInput->setValue( config->readNumEntry("Ver.Oriented Custom Aspect Ratio Height", 600) ); } - m_autoOrientation->setChecked( config->readBoolEntry("Auto Qt::Orientation", false) ); + m_autoOrientation->setChecked( config->readBoolEntry("Auto Orientation", false) ); slotAutoOrientChanged( m_autoOrientation->isChecked() ); } @@ -430,7 +430,7 @@ void ImageEffect_RatioCrop::writeSettings() if (m_originalIsLandscape) { config->writeEntry( "Hor.Oriented Aspect Ratio", m_ratioCB->currentItem() ); - config->writeEntry( "Hor.Oriented Aspect Ratio Qt::Orientation", m_orientCB->currentItem() ); + config->writeEntry( "Hor.Oriented Aspect Ratio Orientation", m_orientCB->currentItem() ); config->writeEntry( "Hor.Oriented Custom Aspect Ratio Num", m_customRatioNInput->value() ); config->writeEntry( "Hor.Oriented Custom Aspect Ratio Den", m_customRatioDInput->value() ); @@ -442,7 +442,7 @@ void ImageEffect_RatioCrop::writeSettings() else { config->writeEntry( "Ver.Oriented Aspect Ratio", m_ratioCB->currentItem() ); - config->writeEntry( "Ver.Oriented Aspect Ratio Qt::Orientation", m_orientCB->currentItem() ); + config->writeEntry( "Ver.Oriented Aspect Ratio Orientation", m_orientCB->currentItem() ); config->writeEntry( "Ver.Oriented Custom Aspect Ratio Num", m_customRatioNInput->value() ); config->writeEntry( "Ver.Oriented Custom Aspect Ratio Den", m_customRatioDInput->value() ); @@ -453,7 +453,7 @@ void ImageEffect_RatioCrop::writeSettings() } config->writeEntry( "Precise Aspect Ratio Crop", m_preciseCrop->isChecked() ); - config->writeEntry( "Auto Qt::Orientation", m_autoOrientation->isChecked() ); + config->writeEntry( "Auto Orientation", m_autoOrientation->isChecked() ); config->writeEntry( "Guide Lines Type", m_guideLinesCB->currentItem() ); config->writeEntry( "Golden Section", m_goldenSectionBox->isChecked() ); config->writeEntry( "Golden Spiral Section", m_goldenSpiralSectionBox->isChecked() ); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index 91c8a7f..9eb5922 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -443,20 +443,20 @@ void RatioCropTool::readSettings() if (m_originalIsLandscape) { - m_orientCB->setCurrentItem(config->readNumEntry("Hor.Oriented Aspect Ratio Qt::Orientation", + m_orientCB->setCurrentItem(config->readNumEntry("Hor.Oriented Aspect Ratio Orientation", ImageSelectionWidget::Landscape)); m_orientCB->setDefaultItem(ImageSelectionWidget::Landscape); } else { - m_orientCB->setCurrentItem(config->readNumEntry("Ver.Oriented Aspect Ratio Qt::Orientation", + m_orientCB->setCurrentItem(config->readNumEntry("Ver.Oriented Aspect Ratio Orientation", ImageSelectionWidget::Portrait)); m_orientCB->setDefaultItem(ImageSelectionWidget::Portrait); } applyRatioChanges(m_ratioCB->currentItem()); - m_autoOrientation->setChecked( config->readBoolEntry("Auto Qt::Orientation", false) ); + m_autoOrientation->setChecked( config->readBoolEntry("Auto Orientation", false) ); slotAutoOrientChanged( m_autoOrientation->isChecked() ); } @@ -468,7 +468,7 @@ void RatioCropTool::writeSettings() if (m_originalIsLandscape) { config->writeEntry("Hor.Oriented Aspect Ratio", m_ratioCB->currentItem()); - config->writeEntry("Hor.Oriented Aspect Ratio Qt::Orientation", m_orientCB->currentItem()); + config->writeEntry("Hor.Oriented Aspect Ratio Orientation", m_orientCB->currentItem()); config->writeEntry("Hor.Oriented Custom Aspect Ratio Num", m_customRatioNInput->value()); config->writeEntry("Hor.Oriented Custom Aspect Ratio Den", m_customRatioDInput->value()); @@ -480,7 +480,7 @@ void RatioCropTool::writeSettings() else { config->writeEntry("Ver.Oriented Aspect Ratio", m_ratioCB->currentItem()); - config->writeEntry("Ver.Oriented Aspect Ratio Qt::Orientation", m_orientCB->currentItem()); + config->writeEntry("Ver.Oriented Aspect Ratio Orientation", m_orientCB->currentItem()); config->writeEntry("Ver.Oriented Custom Aspect Ratio Num", m_customRatioNInput->value()); config->writeEntry("Ver.Oriented Custom Aspect Ratio Den", m_customRatioDInput->value()); @@ -491,7 +491,7 @@ void RatioCropTool::writeSettings() } config->writeEntry("Precise Aspect Ratio Crop", m_preciseCrop->isChecked()); - config->writeEntry("Auto Qt::Orientation", m_autoOrientation->isChecked()); + config->writeEntry("Auto Orientation", m_autoOrientation->isChecked()); config->writeEntry("Guide Lines Type", m_guideLinesCB->currentItem()); config->writeEntry("Golden Section", m_goldenSectionBox->isChecked()); config->writeEntry("Golden Spiral Section", m_goldenSpiralSectionBox->isChecked()); diff --git a/digikam/project/NEWS.0.9.5 b/digikam/project/NEWS.0.9.5 index 85a1e7b..290a77f 100644 --- a/digikam/project/NEWS.0.9.5 +++ b/digikam/project/NEWS.0.9.5 @@ -48,7 +48,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 010 ==> 129379 : Renamed Album is shown multiple times although there is only on related picture directory. 011 ==> 171247 : Album creation error when name start by a number. 012 ==> 150906 : digiKam unable to connect to Panasonic LUMIX DMC-TZ3. -013 ==> 148812 : "Auto Rotate/Flip &Using Exif Qt::Orientation" fails with some images. +013 ==> 148812 : "Auto Rotate/Flip &Using Exif Orientation" fails with some images. 014 ==> 150342 : Camera image window keeps scrolling to the currently downloaded picture. 015 ==> 147475 : digiKam Slideshow - Pause button does not stay sticky / work. 016 ==> 148899 : Image Editor does not get the focus after clicking on an image. diff --git a/digikam/showfoto/setup/setupeditor.cpp b/digikam/showfoto/setup/setupeditor.cpp index 06fc4ca..4ad8856 100644 --- a/digikam/showfoto/setup/setupeditor.cpp +++ b/digikam/showfoto/setup/setupeditor.cpp @@ -214,7 +214,7 @@ void SetupEditor::readSettings() d->useTrash->setChecked(config->readBoolEntry("DeleteItem2Trash", false)); d->showSplash->setChecked(config->readBoolEntry("ShowSplash", true)); d->exifRotateBox->setChecked(config->readBoolEntry("EXIF Rotate", true)); - d->exifSetOrientationBox->setChecked(config->readBoolEntry("EXIF Set Qt::Orientation", true)); + d->exifSetOrientationBox->setChecked(config->readBoolEntry("EXIF Set Orientation", true)); d->underExposureColor->setColor(config->readColorEntry("UnderExposureColor", &White)); d->overExposureColor->setColor(config->readColorEntry("OverExposureColor", &Black)); d->sortOrderComboBox->setCurrentItem(config->readNumEntry("SortOrder", 0)); @@ -234,7 +234,7 @@ void SetupEditor::applySettings() config->writeEntry("DeleteItem2Trash", d->useTrash->isChecked()); config->writeEntry("ShowSplash", d->showSplash->isChecked()); config->writeEntry("EXIF Rotate", d->exifRotateBox->isChecked()); - config->writeEntry("EXIF Set Qt::Orientation", d->exifSetOrientationBox->isChecked()); + config->writeEntry("EXIF Set Orientation", d->exifSetOrientationBox->isChecked()); config->writeEntry("UnderExposureColor", d->underExposureColor->color()); config->writeEntry("OverExposureColor", d->overExposureColor->color()); config->writeEntry("SortOrder", d->sortOrderComboBox->currentItem()); diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp index 280e2bb..961f2ce 100644 --- a/digikam/showfoto/showfoto.cpp +++ b/digikam/showfoto/showfoto.cpp @@ -569,7 +569,7 @@ void ShowFoto::applySettings() m_canvas->setExifOrient(exifRotate); d->thumbBar->setExifRotate(exifRotate); - m_setExifOrientationTag = config->readBoolEntry("EXIF Set Qt::Orientation", true); + m_setExifOrientationTag = config->readBoolEntry("EXIF Set Orientation", true); d->fullScreenHideThumbBar = config->readBoolEntry("FullScreenHideThumbBar", true);