aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/KvsObject_colorDialog.cpp6
-rw-r--r--src/modules/objects/KvsObject_hBox.cpp6
-rw-r--r--src/modules/objects/KvsObject_label.cpp12
-rw-r--r--src/modules/objects/KvsObject_painter.cpp6
-rw-r--r--src/modules/objects/KvsObject_vBox.cpp6
-rw-r--r--src/modules/objects/KvsObject_webView.cpp6
-rw-r--r--src/modules/objects/libkviobjects.cpp3
-rw-r--r--src/modules/objects/qthttp/qhttpauthenticator.cpp3
8 files changed, 23 insertions, 25 deletions
diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp
index a13f29c20..43dcc3918 100644
--- a/src/modules/objects/KvsObject_colorDialog.cpp
+++ b/src/modules/objects/KvsObject_colorDialog.cpp
@@ -170,12 +170,12 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions)
if(!widget())
return true;
int colorDialogOption, sum = 0;
- for(QStringList::Iterator it = szOptions.begin(); it != szOptions.end(); ++it)
+ for(auto & szOption : szOptions)
{
colorDialogOption = 0;
for(unsigned int j = 0; j < option_num; j++)
{
- if(KviQString::equalCI((*it), option_tbl[j]))
+ if(KviQString::equalCI(szOption, option_tbl[j]))
{
colorDialogOption = option_cod[j];
break;
@@ -184,7 +184,7 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions)
if(colorDialogOption)
sum = sum | colorDialogOption;
else
- c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &(*it));
+ c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &szOption);
}
((QColorDialog *)widget())->setOptions(QColorDialog::ColorDialogOptions(sum));
return true;
diff --git a/src/modules/objects/KvsObject_hBox.cpp b/src/modules/objects/KvsObject_hBox.cpp
index 7ee0e4f59..de7325f34 100644
--- a/src/modules/objects/KvsObject_hBox.cpp
+++ b/src/modules/objects/KvsObject_hBox.cpp
@@ -176,13 +176,13 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment)
return true;
}
int align, sum = 0;
- for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it)
+ for(auto & it : alignment)
{
align = 0;
for(unsigned int j = 0; j < align_num; j++)
{
- if(KviQString::equalCI((*it), align_tbl[j]))
+ if(KviQString::equalCI(it, align_tbl[j]))
{
align = align_cod[j];
break;
@@ -191,7 +191,7 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment)
if(align)
sum = sum | align;
else
- c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it));
+ c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it);
}
((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum);
return true;
diff --git a/src/modules/objects/KvsObject_label.cpp b/src/modules/objects/KvsObject_label.cpp
index 3c3baff78..6d9ebf848 100644
--- a/src/modules/objects/KvsObject_label.cpp
+++ b/src/modules/objects/KvsObject_label.cpp
@@ -245,13 +245,13 @@ KVSO_CLASS_FUNCTION(label, setAlignment)
KVSO_PARAMETER("alignment", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, alignment)
KVSO_PARAMETERS_END(c)
int align, sum = 0;
- for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it)
+ for(auto & it : alignment)
{
align = 0;
for(unsigned int j = 0; j < align_num; j++)
{
- if(KviQString::equalCI((*it), align_tbl[j]))
+ if(KviQString::equalCI(it, align_tbl[j]))
{
align = align_cod[j];
break;
@@ -260,7 +260,7 @@ KVSO_CLASS_FUNCTION(label, setAlignment)
if(align)
sum = sum | align;
else
- c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it));
+ c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it);
}
((QLabel *)widget())->setAlignment((Qt::Alignment)sum);
return true;
@@ -300,12 +300,12 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle)
if(!widget())
return true;
int framestyle, sum = 0;
- for(QStringList::Iterator it = style.begin(); it != style.end(); ++it)
+ for(auto & it : style)
{
framestyle = 0;
for(unsigned int j = 0; j < align_num; j++)
{
- if(KviQString::equalCI((*it), frame_tbl[j]))
+ if(KviQString::equalCI(it, frame_tbl[j]))
{
framestyle = frame_cod[j];
break;
@@ -314,7 +314,7 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle)
if(framestyle)
sum = sum | framestyle;
else
- c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &(*it));
+ c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &it);
}
((QLabel *)widget())->setFrameStyle(sum);
return true;
diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index bcc61fd1c..bc16dc8a7 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -1323,12 +1323,12 @@ KVSO_CLASS_FUNCTION(painter, drawText)
int align, sum = 0;
if(szAlignList.count())
{
- for(QStringList::Iterator it = szAlignList.begin(); it != szAlignList.end(); ++it)
+ for(auto & it : szAlignList)
{
align = 0;
for(unsigned int j = 0; j < align_num; j++)
{
- if(KviQString::equalCI((*it), align_tbl[j]))
+ if(KviQString::equalCI(it, align_tbl[j]))
{
align = align_cod[j];
break;
@@ -1337,7 +1337,7 @@ KVSO_CLASS_FUNCTION(painter, drawText)
if(align)
sum = sum | align;
else
- c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it));
+ c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it);
}
}
QRect rect;
diff --git a/src/modules/objects/KvsObject_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp
index a8a17d282..76f750fc1 100644
--- a/src/modules/objects/KvsObject_vBox.cpp
+++ b/src/modules/objects/KvsObject_vBox.cpp
@@ -192,13 +192,13 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment)
}
int align, sum = 0;
- for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it)
+ for(auto & it : alignment)
{
align = 0;
for(unsigned int j = 0; j < align_num; j++)
{
- if(KviQString::equalCI((*it), align_tbl[j]))
+ if(KviQString::equalCI(it, align_tbl[j]))
{
align = align_cod[j];
break;
@@ -207,7 +207,7 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment)
if(align)
sum = sum | align;
else
- c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &(*it));
+ c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &it);
}
if(widget())
((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum);
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 7abc10e6e..89d07f0fe 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -821,12 +821,12 @@ KVSO_CLASS_FUNCTION(webView, findText)
KVSO_PARAMETERS_END(c)
int findflag = 0;
int sum = 0;
- for(QStringList::Iterator it = szFindFlag.begin(); it != szFindFlag.end(); ++it)
+ for(auto & it : szFindFlag)
{
findflag = 0;
for(unsigned int j = 0; j < findflag_num; j++)
{
- if(KviQString::equalCI((*it), findflag_tbl[j]))
+ if(KviQString::equalCI(it, findflag_tbl[j]))
{
findflag = findflag_cod[j];
break;
@@ -835,7 +835,7 @@ KVSO_CLASS_FUNCTION(webView, findText)
if(findflag)
sum = sum | findflag;
else
- c->warning(__tr2qs_ctx("Unknown findflag '%Q'", "objects"), &(*it));
+ c->warning(__tr2qs_ctx("Unknown findflag '%Q'", "objects"), &it);
}
((QWebView *)widget())->findText(szName, (QWebPage::FindFlags)findflag);
return true;
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 99c348974..8d741cf65 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -518,9 +518,8 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
QDir d(szPath);
QStringList sl;
sl = d.entryList(QDir::Files);
- for(QStringList::Iterator it2 = sl.begin(); it2 != sl.end(); ++it2)
+ for(auto szName : sl)
{
- QString szName = *it2;
szName.replace("--", "::");
if(szName != ".." && szName != ".")
classdict->insert(szName.left(szName.length() - 4), &bFake);
diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp
index 9cb7b8d6a..c6063c6c4 100644
--- a/src/modules/objects/qthttp/qhttpauthenticator.cpp
+++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp
@@ -388,9 +388,8 @@ void QHttpAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray,
*/
QByteArray headerVal;
- for(int i = 0; i < values.size(); ++i)
+ for(const auto & current : values)
{
- const QPair<QByteArray, QByteArray> & current = values.at(i);
if(current.first.toLower() != search)
continue;
QByteArray str = current.second.toLower();
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 10:49:58 +0000