diff options
Diffstat (limited to 'digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp')
| -rw-r--r-- | digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp | 270 |
1 files changed, 135 insertions, 135 deletions
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index e869137..91c8a7f 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -23,20 +23,20 @@ * * ============================================================ */ -// Qt includes. - -#include <qcheckbox.h> -#include <qframe.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qrect.h> -#include <qspinbox.h> -#include <qtimer.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqrect.h> +#include <tqspinbox.h> +#include <tqtimer.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -71,8 +71,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -RatioCropTool::RatioCropTool(QObject* parent) - : EditorTool(parent) +RatioCropTool::RatioCropTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("aspectratiocrop"); setToolName(i18n("Aspect Ratio Crop")); @@ -82,7 +82,7 @@ RatioCropTool::RatioCropTool(QObject* parent) // ------------------------------------------------------------- m_imageSelectionWidget = new ImageSelectionWidget(480, 320); - QWhatsThis::add(m_imageSelectionWidget, + TQWhatsThis::add(m_imageSelectionWidget, i18n("<p>Here you can see the aspect ratio selection preview " "used for cropping. You can use the mouse to move and " "resize the crop area. " @@ -109,24 +109,24 @@ RatioCropTool::RatioCropTool(QObject* parent) // now we can set the correct text for the button m_gboxSettings->button(EditorToolSettings::Try)->setText(i18n("Max. Aspect")); - QToolTip::add(m_gboxSettings->button(EditorToolSettings::Try), + TQToolTip::add(m_gboxSettings->button(EditorToolSettings::Try), i18n("<p>Set selection area to the maximum size according " "to the current ratio.")); // ------------------------------------------------------------- - QGridLayout *gboxLayout = new QGridLayout(m_gboxSettings->plainPage(), 3, 2); + TQGridLayout *gboxLayout = new TQGridLayout(m_gboxSettings->plainPage(), 3, 2); - QFrame *cropSelection = new QFrame(m_gboxSettings->plainPage()); - cropSelection->setFrameStyle(QFrame::Panel | QFrame::Sunken); + TQFrame *cropSelection = new TQFrame(m_gboxSettings->plainPage()); + cropSelection->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); - QGridLayout* grid = new QGridLayout(cropSelection, 7, 5); + TQGridLayout* grid = new TQGridLayout(cropSelection, 7, 5); - QLabel *label = new QLabel(i18n("Ratio:"), cropSelection); + TQLabel *label = new TQLabel(i18n("Ratio:"), cropSelection); m_ratioCB = new RComboBox(cropSelection); m_ratioCB->setDefaultItem(ImageSelectionWidget::RATIO03X04); setRatioCBText(ImageSelectionWidget::Landscape); - QWhatsThis::add( m_ratioCB, i18n("<p>Select your constrained aspect ratio for cropping. " + TQWhatsThis::add( m_ratioCB, i18n("<p>Select your constrained aspect ratio for cropping. " "Aspect Ratio Crop tool uses a relative ratio. That means it " "is the same if you use centimeters or inches and it doesn't " "specify the physical size.<p>" @@ -143,34 +143,34 @@ RatioCropTool::RatioCropTool(QObject* parent) "is considered visually harmonious but can be unadapted to print on " "standard photographic paper.")); - m_preciseCrop = new QCheckBox(i18n("Exact"), cropSelection); - QWhatsThis::add( m_preciseCrop, i18n("<p>Enable this option to force exact aspect ratio crop.")); + 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 QLabel(i18n("Orientation:"), cropSelection); + m_orientLabel = new TQLabel(i18n("Qt::Orientation:"), cropSelection); m_orientCB = new RComboBox(cropSelection); m_orientCB->insertItem( i18n("Landscape")); m_orientCB->insertItem( i18n("Portrait")); m_orientCB->setDefaultItem(ImageSelectionWidget::Landscape); - QWhatsThis::add( m_orientCB, i18n("<p>Select constrained aspect ratio orientation.")); + TQWhatsThis::add( m_orientCB, i18n("<p>Select constrained aspect ratio orientation.")); - m_autoOrientation = new QCheckBox(i18n("Auto"), cropSelection); - QWhatsThis::add( m_autoOrientation, i18n("<p>Enable this option to automatically set the orientation.")); + m_autoOrientation = new TQCheckBox(i18n("Auto"), cropSelection); + TQWhatsThis::add( m_autoOrientation, i18n("<p>Enable this option to automatically set the orientation.")); // ------------------------------------------------------------- - m_customLabel1 = new QLabel(i18n("Custom:"), cropSelection); - m_customLabel1->setAlignment(AlignLeft|AlignVCenter); + m_customLabel1 = new TQLabel(i18n("Custom:"), cropSelection); + m_customLabel1->tqsetAlignment(AlignLeft|AlignVCenter); m_customRatioNInput = new RIntNumInput(cropSelection); m_customRatioNInput->input()->setRange(1, 10000, 1, false); m_customRatioNInput->setDefaultValue(1); - QWhatsThis::add( m_customRatioNInput, i18n("<p>Set here the desired custom aspect numerator value.")); + TQWhatsThis::add( m_customRatioNInput, i18n("<p>Set here the desired custom aspect numerator value.")); - m_customLabel2 = new QLabel(" : ", cropSelection); - m_customLabel2->setAlignment(AlignCenter|AlignVCenter); + m_customLabel2 = new TQLabel(" : ", cropSelection); + m_customLabel2->tqsetAlignment(AlignCenter|AlignVCenter); m_customRatioDInput = new RIntNumInput(cropSelection); m_customRatioDInput->input()->setRange(1, 10000, 1, false); m_customRatioDInput->setDefaultValue(1); - QWhatsThis::add( m_customRatioDInput, i18n("<p>Set here the desired custom aspect denominator value.")); + TQWhatsThis::add( m_customRatioDInput, i18n("<p>Set here the desired custom aspect denominator value.")); // ------------------------------------------------------------- @@ -178,7 +178,7 @@ RatioCropTool::RatioCropTool(QObject* parent) m_xInput->input()->setLabel(i18n("X:"), AlignLeft|AlignVCenter); m_xInput->setRange(0, m_imageSelectionWidget->getOriginalImageWidth(), 1); m_xInput->setDefaultValue(50); - QWhatsThis::add( m_xInput, i18n("<p>Set here the top left selection corner position for cropping.")); + TQWhatsThis::add( m_xInput, i18n("<p>Set here the top left selection corner position for cropping.")); m_widthInput = new RIntNumInput(cropSelection); m_widthInput->input()->setLabel(i18n("Width:"), AlignLeft|AlignVCenter); @@ -186,13 +186,13 @@ RatioCropTool::RatioCropTool(QObject* parent) m_imageSelectionWidget->getMaxWidthRange(), m_imageSelectionWidget->getWidthStep()); m_widthInput->setDefaultValue(800); - QWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping.")); + TQWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping.")); - m_centerWidth = new QToolButton(cropSelection); + m_centerWidth = new TQToolButton(cropSelection); KGlobal::dirs()->addResourceType("centerwidth", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); - m_centerWidth->setPixmap(QPixmap(directory + "centerwidth.png")); - QWhatsThis::add(m_centerWidth, i18n("<p>Set width position to center.")); + TQString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); + m_centerWidth->setPixmap(TQPixmap(directory + "centerwidth.png")); + TQWhatsThis::add(m_centerWidth, i18n("<p>Set width position to center.")); // ------------------------------------------------------------- @@ -200,7 +200,7 @@ RatioCropTool::RatioCropTool(QObject* parent) m_yInput->input()->setLabel(i18n("Y:"), AlignLeft | AlignVCenter); m_yInput->setRange(0, m_imageSelectionWidget->getOriginalImageHeight(), 1); m_yInput->setDefaultValue(50); - QWhatsThis::add(m_yInput, i18n("<p>Set here the top left selection corner position for cropping.")); + TQWhatsThis::add(m_yInput, i18n("<p>Set here the top left selection corner position for cropping.")); m_heightInput = new RIntNumInput(cropSelection); m_heightInput->input()->setLabel(i18n("Height:"), AlignLeft | AlignVCenter); @@ -208,13 +208,13 @@ RatioCropTool::RatioCropTool(QObject* parent) m_imageSelectionWidget->getMaxHeightRange(), m_imageSelectionWidget->getHeightStep()); m_heightInput->setDefaultValue(600); - QWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping.")); + TQWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping.")); - m_centerHeight = new QToolButton(cropSelection); + m_centerHeight = new TQToolButton(cropSelection); KGlobal::dirs()->addResourceType("centerheight", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); - m_centerHeight->setPixmap(QPixmap(directory + "centerheight.png")); - QWhatsThis::add(m_centerHeight, i18n("<p>Set height position to center.")); + m_centerHeight->setPixmap(TQPixmap(directory + "centerheight.png")); + TQWhatsThis::add(m_centerHeight, i18n("<p>Set height position to center.")); grid->addMultiCellWidget(label, 0, 0, 0, 0); grid->addMultiCellWidget(m_ratioCB, 0, 0, 1, 3); @@ -237,11 +237,11 @@ RatioCropTool::RatioCropTool(QObject* parent) // ------------------------------------------------------------- - QFrame* compositionGuide = new QFrame(m_gboxSettings->plainPage()); - QGridLayout* grid2 = new QGridLayout(compositionGuide, 8, 3); - compositionGuide->setFrameStyle(QFrame::Panel|QFrame::Sunken); + TQFrame* compositionGuide = new TQFrame(m_gboxSettings->plainPage()); + TQGridLayout* grid2 = new TQGridLayout(compositionGuide, 8, 3); + compositionGuide->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - QLabel *labelGuideLines = new QLabel(i18n("Composition guide:"), compositionGuide); + TQLabel *labelGuideLines = new TQLabel(i18n("Composition guide:"), compositionGuide); m_guideLinesCB = new RComboBox(compositionGuide); m_guideLinesCB->insertItem( i18n("Rules of Thirds")); m_guideLinesCB->insertItem( i18n("Diagonal Method")); @@ -249,34 +249,34 @@ RatioCropTool::RatioCropTool(QObject* parent) m_guideLinesCB->insertItem( i18n("Golden Mean")); m_guideLinesCB->insertItem( i18n("None")); m_guideLinesCB->setDefaultItem(ImageSelectionWidget::GuideNone); - QWhatsThis::add( m_guideLinesCB, i18n("<p>With this option, you can display guide lines " + TQWhatsThis::add( m_guideLinesCB, i18n("<p>With this option, you can display guide lines " "which help you to compose your photograph.")); - m_goldenSectionBox = new QCheckBox(i18n("Golden sections"), compositionGuide); - QWhatsThis::add( m_goldenSectionBox, i18n("<p>Enable this option to show golden sections.")); + m_goldenSectionBox = new TQCheckBox(i18n("Golden sections"), compositionGuide); + TQWhatsThis::add( m_goldenSectionBox, i18n("<p>Enable this option to show golden sections.")); - m_goldenSpiralSectionBox = new QCheckBox(i18n("Golden spiral sections"), compositionGuide); - QWhatsThis::add( m_goldenSpiralSectionBox, i18n("<p>Enable this option to show golden spiral sections.")); + m_goldenSpiralSectionBox = new TQCheckBox(i18n("Golden spiral sections"), compositionGuide); + TQWhatsThis::add( m_goldenSpiralSectionBox, i18n("<p>Enable this option to show golden spiral sections.")); - m_goldenSpiralBox = new QCheckBox(i18n("Golden spiral"), compositionGuide); - QWhatsThis::add( m_goldenSpiralBox, i18n("<p>Enable this option to show golden spiral guide.")); + m_goldenSpiralBox = new TQCheckBox(i18n("Golden spiral"), compositionGuide); + TQWhatsThis::add( m_goldenSpiralBox, i18n("<p>Enable this option to show golden spiral guide.")); - m_goldenTriangleBox = new QCheckBox(i18n("Golden triangles"), compositionGuide); - QWhatsThis::add( m_goldenTriangleBox, i18n("<p>Enable this option to show golden triangles.")); + m_goldenTriangleBox = new TQCheckBox(i18n("Golden triangles"), compositionGuide); + TQWhatsThis::add( m_goldenTriangleBox, i18n("<p>Enable this option to show golden triangles.")); - m_flipHorBox = new QCheckBox(i18n("Flip horizontally"), compositionGuide); - QWhatsThis::add( m_flipHorBox, i18n("<p>Enable this option to flip horizontally guidelines.")); + m_flipHorBox = new TQCheckBox(i18n("Flip horizontally"), compositionGuide); + TQWhatsThis::add( m_flipHorBox, i18n("<p>Enable this option to flip horizontally guidelines.")); - m_flipVerBox = new QCheckBox(i18n("Flip vertically"), compositionGuide); - QWhatsThis::add( m_flipVerBox, i18n("<p>Enable this option to flip vertically guidelines.")); + m_flipVerBox = new TQCheckBox(i18n("Flip vertically"), compositionGuide); + TQWhatsThis::add( m_flipVerBox, i18n("<p>Enable this option to flip vertically guidelines.")); - m_colorGuideLabel = new QLabel(i18n("Color and width:"), compositionGuide); - m_guideColorBt = new KColorButton(QColor(250, 250, 255), compositionGuide); + m_colorGuideLabel = new TQLabel(i18n("Color and width:"), compositionGuide); + m_guideColorBt = new KColorButton(TQColor(250, 250, 255), compositionGuide); m_guideSize = new RIntNumInput(compositionGuide); m_guideSize->input()->setRange(1, 5, 1, false); m_guideSize->setDefaultValue(1); - QWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw composition guides.")); - QWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw composition guides.")); + TQWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw composition guides.")); + TQWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw composition guides.")); grid2->addMultiCellWidget(labelGuideLines, 0, 0, 0, 0); grid2->addMultiCellWidget(m_guideLinesCB, 0, 0, 1, 2); @@ -306,84 +306,84 @@ RatioCropTool::RatioCropTool(QObject* parent) // ------------------------------------------------------------- - connect(m_ratioCB, SIGNAL(activated(int)), - this, SLOT(slotRatioChanged(int))); + connect(m_ratioCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotRatioChanged(int))); - connect(m_preciseCrop, SIGNAL(toggled(bool)), - this, SLOT(slotPreciseCropChanged(bool))); + connect(m_preciseCrop, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotPreciseCropChanged(bool))); - connect(m_orientCB, SIGNAL(activated(int)), - this, SLOT(slotOrientChanged(int))); + connect(m_orientCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotOrientChanged(int))); - connect(m_autoOrientation, SIGNAL(toggled(bool)), - this, SLOT(slotAutoOrientChanged(bool))); + connect(m_autoOrientation, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAutoOrientChanged(bool))); - connect(m_xInput, SIGNAL(valueChanged(int)), - this, SLOT(slotXChanged(int))); + connect(m_xInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotXChanged(int))); - connect(m_yInput, SIGNAL(valueChanged(int)), - this, SLOT(slotYChanged(int))); + connect(m_yInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotYChanged(int))); - connect(m_customRatioNInput, SIGNAL(valueChanged(int)), - this, SLOT(slotCustomNRatioChanged(int))); + connect(m_customRatioNInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotCustomNRatioChanged(int))); - connect(m_customRatioDInput, SIGNAL(valueChanged(int)), - this, SLOT(slotCustomDRatioChanged(int))); + connect(m_customRatioDInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotCustomDRatioChanged(int))); - connect(m_guideLinesCB, SIGNAL(activated(int)), - this, SLOT(slotGuideTypeChanged(int))); + connect(m_guideLinesCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotGuideTypeChanged(int))); - connect(m_goldenSectionBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSectionBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralSectionBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralSectionBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenTriangleBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenTriangleBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipHorBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipHorBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipVerBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipVerBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_guideColorBt, SIGNAL(changed(const QColor&)), - m_imageSelectionWidget, SLOT(slotChangeGuideColor(const QColor&))); + connect(m_guideColorBt, TQT_SIGNAL(changed(const TQColor&)), + m_imageSelectionWidget, TQT_SLOT(slotChangeGuideColor(const TQColor&))); - connect(m_guideSize, SIGNAL(valueChanged(int)), - m_imageSelectionWidget, SLOT(slotChangeGuideSize(int))); + connect(m_guideSize, TQT_SIGNAL(valueChanged(int)), + m_imageSelectionWidget, TQT_SLOT(slotChangeGuideSize(int))); - connect(m_widthInput, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthChanged(int))); + connect(m_widthInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthChanged(int))); - connect(m_heightInput, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightChanged(int))); + connect(m_heightInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightChanged(int))); - connect(m_imageSelectionWidget, SIGNAL(signalSelectionChanged(QRect)), - this, SLOT(slotSelectionChanged(QRect))); + connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionChanged(TQRect)), + this, TQT_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, SIGNAL(signalSelectionMoved(QRect)), - this, SLOT(slotSelectionChanged(QRect))); + connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionMoved(TQRect)), + this, TQT_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, SIGNAL(signalSelectionOrientationChanged(int)), - this, SLOT(slotSelectionOrientationChanged(int))); + connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionOrientationChanged(int)), + this, TQT_SLOT(slotSelectionOrientationChanged(int))); - connect(m_centerWidth, SIGNAL(clicked()), - this, SLOT(slotCenterWidth())); + connect(m_centerWidth, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCenterWidth())); - connect(m_centerHeight, SIGNAL(clicked()), - this, SLOT(slotCenterHeight())); + connect(m_centerHeight, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCenterHeight())); // we need to disconnect the standard connection of the Try button first - disconnect(m_gboxSettings, SIGNAL(signalTryClicked()), - this, SLOT(slotEffect())); + disconnect(m_gboxSettings, TQT_SIGNAL(signalTryClicked()), + this, TQT_SLOT(slotEffect())); - connect(m_gboxSettings, SIGNAL(signalTryClicked()), - this, SLOT(slotMaxAspectRatio())); + connect(m_gboxSettings, TQT_SIGNAL(signalTryClicked()), + this, TQT_SLOT(slotMaxAspectRatio())); // ------------------------------------------------------------- @@ -397,7 +397,7 @@ RatioCropTool::~RatioCropTool() void RatioCropTool::readSettings() { - QColor defaultGuideColor(250, 250, 255); + TQColor defaultGuideColor(250, 250, 255); KConfig *config = kapp->config(); config->setGroup("aspectratiocrop Tool"); @@ -407,8 +407,8 @@ void RatioCropTool::readSettings() m_goldenSpiralSectionBox->setChecked(config->readBoolEntry("Golden Spiral Section", false)); m_goldenSpiralBox->setChecked(config->readBoolEntry("Golden Spiral", false)); m_goldenTriangleBox->setChecked(config->readBoolEntry("Golden Triangle", false)); - m_flipHorBox->setChecked(config->readBoolEntry("Golden Flip Horizontal", false)); - m_flipVerBox->setChecked(config->readBoolEntry("Golden Flip Vertical", false)); + m_flipHorBox->setChecked(config->readBoolEntry("Golden FlipQt::Horizontal", false)); + m_flipVerBox->setChecked(config->readBoolEntry("Golden FlipQt::Vertical", false)); m_guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor)); m_guideSize->setValue(config->readNumEntry("Guide Width", m_guideSize->defaultValue())); m_imageSelectionWidget->slotGuideLines(m_guideLinesCB->currentItem()); @@ -443,20 +443,20 @@ void RatioCropTool::readSettings() if (m_originalIsLandscape) { - m_orientCB->setCurrentItem(config->readNumEntry("Hor.Oriented Aspect Ratio Orientation", + m_orientCB->setCurrentItem(config->readNumEntry("Hor.Oriented Aspect Ratio Qt::Orientation", ImageSelectionWidget::Landscape)); m_orientCB->setDefaultItem(ImageSelectionWidget::Landscape); } else { - m_orientCB->setCurrentItem(config->readNumEntry("Ver.Oriented Aspect Ratio Orientation", + m_orientCB->setCurrentItem(config->readNumEntry("Ver.Oriented Aspect Ratio Qt::Orientation", ImageSelectionWidget::Portrait)); m_orientCB->setDefaultItem(ImageSelectionWidget::Portrait); } applyRatioChanges(m_ratioCB->currentItem()); - m_autoOrientation->setChecked( config->readBoolEntry("Auto Orientation", false) ); + m_autoOrientation->setChecked( config->readBoolEntry("Auto Qt::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 Orientation", m_orientCB->currentItem()); + config->writeEntry("Hor.Oriented Aspect Ratio Qt::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 Orientation", m_orientCB->currentItem()); + config->writeEntry("Ver.Oriented Aspect Ratio Qt::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,14 +491,14 @@ void RatioCropTool::writeSettings() } config->writeEntry("Precise Aspect Ratio Crop", m_preciseCrop->isChecked()); - config->writeEntry("Auto Orientation", m_autoOrientation->isChecked()); + config->writeEntry("Auto Qt::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()); config->writeEntry("Golden Spiral", m_goldenSpiralBox->isChecked()); config->writeEntry("Golden Triangle", m_goldenTriangleBox->isChecked()); - config->writeEntry("Golden Flip Horizontal", m_flipHorBox->isChecked()); - config->writeEntry("Golden Flip Vertical", m_flipVerBox->isChecked()); + config->writeEntry("Golden FlipQt::Horizontal", m_flipHorBox->isChecked()); + config->writeEntry("Golden FlipQt::Vertical", m_flipVerBox->isChecked()); config->writeEntry("Guide Color", m_guideColorBt->color()); config->writeEntry("Guide Width", m_guideSize->value()); config->sync(); @@ -524,7 +524,7 @@ void RatioCropTool::slotCenterHeight() m_imageSelectionWidget->setCenterSelection(ImageSelectionWidget::CenterHeight); } -void RatioCropTool::slotSelectionChanged(QRect rect) +void RatioCropTool::slotSelectionChanged(TQRect rect) { m_xInput->blockSignals(true); m_yInput->blockSignals(true); @@ -592,7 +592,7 @@ void RatioCropTool::slotSelectionOrientationChanged(int newOrientation) setRatioCBText(newOrientation); - // Change Orientation ComboBox + // Change Qt::Orientation ComboBox m_orientCB->setCurrentItem(newOrientation); @@ -825,7 +825,7 @@ void RatioCropTool::finalRendering() { kapp->setOverrideCursor( KCursor::waitCursor() ); - QRect currentRegion = m_imageSelectionWidget->getRegionSelection(); + TQRect currentRegion = m_imageSelectionWidget->getRegionSelection(); ImageIface* iface = m_imageSelectionWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -833,7 +833,7 @@ void RatioCropTool::finalRendering() bool a = iface->originalHasAlpha(); bool sb = iface->originalSixteenBit(); - QRect normalizedRegion = currentRegion.normalize(); + TQRect normalizedRegion = currentRegion.normalize(); if (normalizedRegion.right() > w) normalizedRegion.setRight(w); |