From f99d960678cd99605317989a4af2418695dde8dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sacha=20Percot-T=C3=A9tu?= <zakinster@zakinster.com>
Date: Mon, 24 Sep 2012 15:12:52 +0200
Subject: [PATCH] Added missing const
---
app/Operations/CroissanceOp.cpp | 2 +-
app/Operations/NoiseOp.cpp | 2 +-
app/Operations/NoiseOp.h | 2 +-
app/Operations/PointOp.cpp | 4 ++--
app/Operations/PointOp.h | 2 +-
app/Operations/ScalingOp.cpp | 2 +-
app/Operations/ScalingOp.h | 2 +-
app/Services/OperationService.cpp | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app/Operations/CroissanceOp.cpp b/app/Operations/CroissanceOp.cpp
index e9b6990..495c6de 100644
--- a/app/Operations/CroissanceOp.cpp
+++ b/app/Operations/CroissanceOp.cpp
@@ -42,7 +42,7 @@ bool CroissanceOp::needCurrentImg() const {
return true;
}
-void CroissanceOp::operator()(const imagein::Image* image, const std::map<const imagein::Image*, std::string>&) {
+void CroissanceOp::operator()(const imagein::Image* img, const std::map<const imagein::Image*, std::string>&) {
QDialog* dialog = new QDialog(QApplication::activeWindow());
dialog->setWindowTitle(QString(qApp->translate("Operations", "Croissance")));
diff --git a/app/Operations/NoiseOp.cpp b/app/Operations/NoiseOp.cpp
index 20944dd..2e71001 100644
--- a/app/Operations/NoiseOp.cpp
+++ b/app/Operations/NoiseOp.cpp
@@ -43,7 +43,7 @@ NoiseOp::NoiseOp() : GenericOperation(qApp->translate("Operations", "Add noise")
{
}
-void NoiseOp::operator()(const ImageWindow* currentWnd, vector<ImageWindow*>&) {
+void NoiseOp::operator()(const ImageWindow* currentWnd, const vector<const ImageWindow*>&) {
QDialog* dialog = new QDialog();
dialog->setWindowTitle(qApp->translate("Operations", "Parameters"));
diff --git a/app/Operations/NoiseOp.h b/app/Operations/NoiseOp.h
index 62aedf5..1c32471 100644
--- a/app/Operations/NoiseOp.h
+++ b/app/Operations/NoiseOp.h
@@ -28,7 +28,7 @@ class NoiseOp : public GenericOperation
public:
NoiseOp();
- virtual void operator()(const genericinterface::ImageWindow* currentWnd, std::vector<genericinterface::ImageWindow*>&);
+ virtual void operator()(const genericinterface::ImageWindow* currentWnd, const std::vector<const genericinterface::ImageWindow*>&);
virtual bool isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const;
diff --git a/app/Operations/PointOp.cpp b/app/Operations/PointOp.cpp
index 8cf8756..e4f86cf 100644
--- a/app/Operations/PointOp.cpp
+++ b/app/Operations/PointOp.cpp
@@ -90,7 +90,7 @@ PointOp::DoubleImageOp* PointOp::DoubleImageOp::fromString(QString op) {
return new DoubleImgIdent();
}
-void PointOp::operator()(const ImageWindow* currentWnd, vector<ImageWindow*>& wndList) {
+void PointOp::operator()(const ImageWindow* currentWnd, const vector<const ImageWindow*>& wndList) {
QStringList pixOperators, imgOperators;
@@ -99,7 +99,7 @@ void PointOp::operator()(const ImageWindow* currentWnd, vector<ImageWindow*>& wn
QString currentImgName = currentWnd->windowTitle();
map<const Image*,string> stdImgList;
map<const Image_t<double>*,string> dblImgList;
- for(vector<ImageWindow*>::iterator it = wndList.begin(); it != wndList.end(); ++it) {
+ for(vector<const ImageWindow*>::const_iterator it = wndList.begin(); it != wndList.end(); ++it) {
if((*it)->isStandard()) {
const StandardImageWindow* stdImgWnd = dynamic_cast<const StandardImageWindow*>(*it);
stdImgList.insert(pair<const Image*, string>(stdImgWnd->getImage(), stdImgWnd->windowTitle().toStdString()));
diff --git a/app/Operations/PointOp.h b/app/Operations/PointOp.h
index ffe4a8f..dec846e 100644
--- a/app/Operations/PointOp.h
+++ b/app/Operations/PointOp.h
@@ -36,7 +36,7 @@ class PointOp : public GenericOperation {
PointOp();
- virtual void operator()(const genericinterface::ImageWindow* currentWnd, std::vector<genericinterface::ImageWindow*>&);
+ virtual void operator()(const genericinterface::ImageWindow* currentWnd, const std::vector<const genericinterface::ImageWindow*>&);
bool needCurrentImg() const;
virtual bool isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const;
diff --git a/app/Operations/ScalingOp.cpp b/app/Operations/ScalingOp.cpp
index c8bf6db..832919a 100644
--- a/app/Operations/ScalingOp.cpp
+++ b/app/Operations/ScalingOp.cpp
@@ -50,7 +50,7 @@ bool ScalingOp::isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const
return imgWnd != NULL;
}
-void ScalingOp::operator()(const genericinterface::ImageWindow* currentWnd, vector<ImageWindow*>&) {
+void ScalingOp::operator()(const genericinterface::ImageWindow* currentWnd, const vector<const ImageWindow*>&) {
QDialog* dialog = new QDialog(QApplication::activeWindow());
dialog->setWindowTitle(QString(qApp->translate("Operations", "Scaling")));
diff --git a/app/Operations/ScalingOp.h b/app/Operations/ScalingOp.h
index 551ba94..dc8199e 100644
--- a/app/Operations/ScalingOp.h
+++ b/app/Operations/ScalingOp.h
@@ -44,7 +44,7 @@ public:
static void interpolate(typename imagein::Image_t<D>::ConstLine src, typename imagein::Image_t<double>::Line dst);
};
- virtual void operator()(const genericinterface::ImageWindow* currentWnd, std::vector<genericinterface::ImageWindow*>&);
+ virtual void operator()(const genericinterface::ImageWindow* currentWnd, const std::vector<const genericinterface::ImageWindow*>&);
bool needCurrentImg() const;
virtual bool isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const;
diff --git a/app/Services/OperationService.cpp b/app/Services/OperationService.cpp
index 57c3619..f66fac0 100644
--- a/app/Services/OperationService.cpp
+++ b/app/Services/OperationService.cpp
@@ -69,8 +69,8 @@ void OperationService::operation() {
if(_operation->needCurrentImg() && !_operation->isValidImgWnd(curImgWnd)) return;
map<const ImageWindow*, string> wndList;
- vector<ImageWindow*> windows = ws->getImageWindows();
- for(vector<ImageWindow*>::iterator it = windows.begin(); it < windows.end(); ++it) {
+ vector<const ImageWindow*> windows = ws->getImageWindows();
+ for(vector<const ImageWindow*>::const_iterator it = windows.begin(); it < windows.end(); ++it) {
wndList.insert(pair<const ImageWindow*, string>(*it, (*it)->windowTitle().toStdString()));
}
--
GitLab