summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-03-05 05:01:50 +0100
committerSlávek Banko <slavek.banko@axis.cz>2015-03-05 05:01:50 +0100
commit97575faeaadb5c350049c52063e247e5462302d5 (patch)
tree04757ce2b55d3f03787192cb50f4eeeb88ff7983
parent8ef2216f4ef8a94906fad84784f4f738d818936c (diff)
downloaddigikam-97575fae.tar.gz
digikam-97575fae.zip
Fix incorrectly renamed strings
-rw-r--r--digikam/libs/widgets/imageplugins/imageguidewidget.h44
-rw-r--r--digikam/libs/widgets/metadata/metadatalistview.cpp16
-rw-r--r--digikam/showfoto/showfoto.cpp4
-rw-r--r--digikam/utilities/imageeditor/canvas/undoaction.cpp12
-rw-r--r--digikam/utilities/imageeditor/editor/editorwindow.cpp4
5 files changed, 40 insertions, 40 deletions
diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.h b/digikam/libs/widgets/imageplugins/imageguidewidget.h
index aaa74df..5cf7a11 100644
--- a/digikam/libs/widgets/imageplugins/imageguidewidget.h
+++ b/digikam/libs/widgets/imageplugins/imageguidewidget.h
@@ -5,7 +5,7 @@
*
* Date : 2004-08-20
* Description : a widget to display an image with guides
- *
+ *
* Copyright (C) 2004-2008 Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
@@ -13,12 +13,12 @@
* Public License as published by the Free Software Foundation;
* either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
#ifndef IMAGEGUIDEWIDGET_H
@@ -47,23 +47,23 @@ class ImageGuideWidgetPriv;
class DIGIKAM_EXPORT ImageGuideWidget : public TQWidget
{
Q_OBJECT
-
+
public:
- enum GuideToolMode
+ enum GuideToolMode
{
HVGuideMode=0,
PickColorMode
};
- enum RenderingPreviewMode
+ enum RenderingPreviewMode
{
PreviewOriginalImage=0, // Original image only.
- PreviewBothImagesHorz, //Qt::Horizontal with original and target duplicated.
- PreviewBothImagesVert, //Qt::Vertical with original and target duplicated.
- PreviewBothImagesHorzCont, //Qt::Horizontal with original and target in contiguous.
- PreviewBothImagesVertCont, //Qt::Vertical with original and target in contiguous.
+ PreviewBothImagesHorz, // Horizontal with original and target duplicated.
+ PreviewBothImagesVert, // Vertical with original and target duplicated.
+ PreviewBothImagesHorzCont, // Horizontal with original and target in contiguous.
+ PreviewBothImagesVertCont, // Vertical with original and target in contiguous.
PreviewTargetImage, // Target image only.
PreviewToggleOnMouseOver, // Original image if mouse is over image area, else target image.
NoPreviewMode // Target image only without information displayed.
@@ -78,14 +78,14 @@ public:
public:
- ImageGuideWidget(int w, int h, TQWidget *parent=0,
+ ImageGuideWidget(int w, int h, TQWidget *parent=0,
bool spotVisible=true, int guideMode=HVGuideMode,
- const TQColor& guideColor=TQt::red, int guideSize=1,
+ const TQColor& guideColor=TQt::red, int guideSize=1,
bool blink=false, bool useImageSelection=false);
~ImageGuideWidget();
-
+
ImageIface* imageIface();
-
+
TQPoint getSpotPosition();
DColor getSpotColor(int getColorFrom);
void setSpotVisible(bool spotVisible, bool blink=false);
@@ -94,13 +94,13 @@ public:
void updatePreview();
public slots:
-
+
void slotChangeGuideColor(const TQColor &color);
- void slotChangeGuideSize(int size);
+ void slotChangeGuideSize(int size);
void slotChangeRenderingPreviewMode(int mode);
- void slotToggleUnderExposure(bool);
- void slotToggleOverExposure(bool);
-
+ void slotToggleUnderExposure(bool);
+ void slotToggleOverExposure(bool);
+
signals:
void spotPositionChangedFromOriginal(const Digikam::DColor &color, const TQPoint &position);
@@ -108,7 +108,7 @@ signals:
void signalResized();
protected:
-
+
void paintEvent(TQPaintEvent*);
void resizeEvent(TQResizeEvent*);
void timerEvent(TQTimerEvent*);
@@ -117,14 +117,14 @@ protected:
void mouseMoveEvent(TQMouseEvent*);
void enterEvent(TQEvent*);
void leaveEvent(TQEvent*);
-
+
private:
void updatePixmap();
private:
- ImageGuideWidgetPriv *d;
+ ImageGuideWidgetPriv *d;
};
} // NameSpace Digikam
diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp
index ed702b0..f2cd414 100644
--- a/digikam/libs/widgets/metadata/metadatalistview.cpp
+++ b/digikam/libs/widgets/metadata/metadatalistview.cpp
@@ -4,9 +4,9 @@
* http://www.digikam.org
*
* Date : 2006-02-21
- * Description : a generic list view widget to
+ * Description : a generic list view widget to
* display metadata
- *
+ *
* Copyright (c) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
@@ -14,12 +14,12 @@
* Public License as published by the Free Software Foundation;
* either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
// TQt includes.
@@ -53,7 +53,7 @@ MetadataListView::MetadataListView(TQWidget* parent)
setItemMargin(0);
setAllColumnsShowFocus(true);
setResizeMode(TQListView::AllColumns);
- //Qt::Vertical scroll bar is always disable to give more
+ // Vertical scroll bar is always disable to give more
// free space to metadata content
setVScrollBarMode(TQScrollView::AlwaysOff);
@@ -203,9 +203,9 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
subItems = 0;
parentifDItem = new MdKeyListViewItem(this, *itKeysFilter);
- DMetadata::MetaDataMap::const_iterator it = ifds.end();
+ DMetadata::MetaDataMap::const_iterator it = ifds.end();
- while(1)
+ while(1)
{
if ( *itKeysFilter == it.key().section('.', 1, 1) )
{
@@ -259,7 +259,7 @@ void MetadataListView::slotSearchTextChanged(const TQString& filter)
TQString search = filter.lower();
TQListViewItemIterator it(this);
- for ( ; it.current(); ++it )
+ for ( ; it.current(); ++it )
{
MetadataListViewItem *item = dynamic_cast<MetadataListViewItem*>(it.current());
if (item)
diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp
index bae1dae..f3b61f2 100644
--- a/digikam/showfoto/showfoto.cpp
+++ b/digikam/showfoto/showfoto.cpp
@@ -413,7 +413,7 @@ void ShowFoto::setupUserArea()
TQWidget* widget = new TQWidget(this);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
- if(!config->readBoolEntry("HorizontalThumbbar", false)) //Qt::Vertical thumbbar layout
+ if(!config->readBoolEntry("HorizontalThumbbar", false)) // Vertical thumbbar layout
{
TQHBoxLayout *hlay = new TQHBoxLayout(widget);
m_splitter = new TQSplitter(widget);
@@ -428,7 +428,7 @@ void ShowFoto::setupUserArea()
hlay->addWidget(m_splitter);
hlay->addWidget(d->rightSidebar);
}
- else //Qt::Horizontal thumbbar layout
+ else // Horizontal thumbbar layout
{
m_splitter = new TQSplitter(Qt::Horizontal, widget);
TQWidget* widget2 = new TQWidget(m_splitter);
diff --git a/digikam/utilities/imageeditor/canvas/undoaction.cpp b/digikam/utilities/imageeditor/canvas/undoaction.cpp
index 3343596..dea1a94 100644
--- a/digikam/utilities/imageeditor/canvas/undoaction.cpp
+++ b/digikam/utilities/imageeditor/canvas/undoaction.cpp
@@ -5,7 +5,7 @@
*
* Date : 2005-02-06
* Description : undo actions manager for image editor.
- *
+ *
* Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
* Copyright (C) 2005 by Joern Ahrens <joern.ahrens@kdemail.net>
*
@@ -14,12 +14,12 @@
* Public License as published by the Free Software Foundation;
* either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
// Local includes.
@@ -109,9 +109,9 @@ UndoActionFlip::UndoActionFlip(DImgInterface* iface,
: UndoAction(iface), m_dir(dir)
{
if(m_dir ==Qt::Horizontal)
- m_title = i18n("FlipQt::Horizontal");
+ m_title = i18n("Flip Horizontal");
else if(m_dir ==Qt::Vertical)
- m_title = i18n("FlipQt::Vertical");
+ m_title = i18n("Flip Vertical");
}
UndoActionFlip::~UndoActionFlip()
@@ -146,7 +146,7 @@ UndoActionBCG::UndoActionBCG(DImgInterface* iface,
m_oldContrast(oldContrast), m_newGamma(newGamma), m_newBrightness(newBrightness),
m_newContrast(newContrast)
{
- m_title = i18n("Brightness,Contrast,Gamma");
+ m_title = i18n("Brightness,Contrast,Gamma");
}
UndoActionBCG::~UndoActionBCG()
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index e2cf2d4..654b28e 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -443,12 +443,12 @@ void EditorWindow::setupStandardActions()
// -- Standard 'Flip' menu actions ---------------------------------------------
- d->flipHorizAction = new TDEAction(i18n("FlipQt::Horizontally"), "mirror", CTRL+Key_Asterisk,
+ d->flipHorizAction = new TDEAction(i18n("Flip Horizontally"), "mirror", CTRL+Key_Asterisk,
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipHoriz()),
actionCollection(), "editorwindow_flip_horiz");
d->flipHorizAction->setEnabled(false);
- d->flipVertAction = new TDEAction(i18n("FlipQt::Vertically"), "flip", CTRL+Key_Slash,
+ d->flipVertAction = new TDEAction(i18n("Flip Vertically"), "flip", CTRL+Key_Slash,
TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipVert()),
actionCollection(), "editorwindow_flip_vert");
d->flipVertAction->setEnabled(false);