Simplify rfb::ParameterIterator - we always iterate over all enabled params.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5064 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/Configuration.h b/common/rfb/Configuration.h
index e3337f4..4feeb78 100644
--- a/common/rfb/Configuration.h
+++ b/common/rfb/Configuration.h
@@ -268,12 +268,12 @@
};
// -=- ParameterIterator
- // Iterates over all the Parameters in a Configuration group. The
- // current Parameter is accessed via param, the current Configuration
- // via config. The next() method moves on to the next Parameter.
+ // Iterates over all enabled parameters (global + server/viewer).
+ // Current Parameter is accessed via param, the current Configuration
+ // via config. The next() method moves on to the next Parameter.
struct ParameterIterator {
- ParameterIterator(Configuration* c) : config(c), param(c ? c->head : 0) {}
+ ParameterIterator() : config(Configuration::global()), param(config->head) {}
void next() {
param = param->_next;
while (!param) {
diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index 95c84ff..7fad77d 100644
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -768,7 +768,7 @@
int nParams = 0;
int len = 0;
- for (ParameterIterator i(Configuration::global()); i.param; i.next()) {
+ for (ParameterIterator i; i.param; i.next()) {
int l = strlen(i.param->getName());
if (l <= 255) {
nParams++;
@@ -792,7 +792,7 @@
WriteToClient(client, sizeof(xVncExtListParamsReply), (char *)&rep);
rdr::U8* data = new rdr::U8[len];
rdr::U8* ptr = data;
- for (ParameterIterator i(Configuration::global()); i.param; i.next()) {
+ for (ParameterIterator i; i.param; i.next()) {
int l = strlen(i.param->getName());
if (l <= 255) {
*ptr++ = l;
diff --git a/unix/xserver/hw/vnc/xf86vncModule.cc b/unix/xserver/hw/vnc/xf86vncModule.cc
index f37600b..9352c80 100644
--- a/unix/xserver/hw/vnc/xf86vncModule.cc
+++ b/unix/xserver/hw/vnc/xf86vncModule.cc
@@ -97,7 +97,7 @@
for (int scr = 0; scr < screenInfo.numScreens; scr++) {
ScrnInfoPtr pScrn = xf86Screens[scr];
- for (ParameterIterator i(Configuration::global()); i.param; i.next()) {
+ for (ParameterIterator i; i.param; i.next()) {
const char *val;
#if XORG < 112
val = xf86FindOptionValue(pScrn->options, i.param->getName());