Commit fab8851c authored by hkrishna's avatar hkrishna

warning fixes for viewer directory

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23638 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1bef87fd
......@@ -705,7 +705,7 @@ ActionGroupDescription::GetAction(int index) const
{
ViewerRPC::ViewerRPCType retval = ViewerRPC::MaxRPC;
if(index >= 0 && index < actions.size())
if(index >= 0 && index < (int)actions.size())
{
ViewerRPC::ViewerRPCType_FromString(actions[index], retval);
}
......
......@@ -136,7 +136,7 @@ AnimationStopAction::Execute()
if (DDTManager::isDDTSim(window))
{
const EngineKey &key = window->GetPlotList()->GetEngineKey();
const avtDatabaseMetaData *md = ViewerEngineManager::Instance()->GetSimulationMetaData(key);
//const avtDatabaseMetaData *md = ViewerEngineManager::Instance()->GetSimulationMetaData(key);
ViewerEngineManager::Instance()->SendSimulationCommand(key, DDTSIM_CMD_STOP, "");
}
else
......
......@@ -67,7 +67,7 @@
// ****************************************************************************
DDTSession::DDTSession(const QString server) :
mErrorText(QString::null), mServer(server), mSocket(NULL)
mSocket(NULL), mErrorText(QString::null), mServer(server)
{
mSocket = new QLocalSocket(this);
......
......@@ -714,7 +714,7 @@ LineoutListItem::Update(Subject *TheChangedSubject)
addme.push_back(nq);
}
}
for (i = 0; i < addme.size(); i++)
for (i = 0; i < (int)addme.size(); i++)
{
AddQuery(addme[i]);
}
......
......@@ -240,7 +240,7 @@ AddOperatorAction::Execute(int)
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i< (unsigned int) windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
AddOperator(type, applyOperatorToAllPlots, fromDefault);
......@@ -389,7 +389,7 @@ PromoteOperatorAction::Execute()
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i< (unsigned int) windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
PromoteOperator(args.GetOperatorType(), applyOperatorToAllPlots);
......@@ -465,7 +465,7 @@ DemoteOperatorAction::Execute()
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i< (unsigned int)windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
DemoteOperator(args.GetOperatorType(), applyOperatorToAllPlots);
......@@ -541,7 +541,7 @@ RemoveOperatorAction::Execute()
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i< (unsigned int) windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
RemoveOperator(args.GetOperatorType(), applyOperatorToAllPlots);
......@@ -619,7 +619,7 @@ RemoveLastOperatorAction::Execute()
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i< (unsigned int)windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
RemoveLastOperator(applyOperatorToAllPlots);
......@@ -721,7 +721,7 @@ RemoveAllOperatorsAction::Execute()
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i< (unsigned int) windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
RemoveAllOperators(applyOperatorToAllPlots);
......@@ -828,7 +828,7 @@ SetOperatorOptionsAction::Execute()
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i< (unsigned int) windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
SetPlotOperatorAtts(oper, windowMgr->GetWindow(i)==window,
......@@ -952,7 +952,7 @@ AddPlotAction::AddPlotAction(ViewerWindow *win) : ViewerMultipleAction(win),
AddPlotAction::~AddPlotAction()
{
for(int i = 0; i < pluginEntries.size(); ++i)
for(size_t i = 0; i < pluginEntries.size(); ++i)
delete pluginEntries[i].varMenu;
}
......@@ -1049,7 +1049,7 @@ AddPlotAction::Update()
// Update the variable menus for the actions.
//
bool menuEnabled = false;
for(int i = 0; i < pluginEntries.size(); ++i)
for(size_t i = 0; i < pluginEntries.size(); ++i)
{
DeletePlotMenu(i);
CreatePlotMenu(i);
......@@ -1236,7 +1236,7 @@ AddPlotAction::ConstructMenu(QMenu *menu)
// Create a new menu and add all of the actions to it.
actionMenu = new QMenu("Add plot", menu);
for(int i = 0; i < pluginEntries.size(); ++i)
for(size_t i = 0; i < pluginEntries.size(); ++i)
{
// Create the menu for the plot.
CreatePlotMenu(i);
......@@ -1307,7 +1307,7 @@ AddPlotAction::RemoveFromMenu(QMenu *menu)
void
AddPlotAction::ConstructToolbar(QToolBar *toolbar)
{
for(int i = 0; i < children.size(); ++i)
for(size_t i = 0; i < children.size(); ++i)
toolbar->addAction(children[i]);
}
......@@ -1464,7 +1464,7 @@ DrawPlotsAction::Execute()
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i< (unsigned int) windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
RealizePlots(args.GetBoolFlag());
......@@ -1755,7 +1755,7 @@ SetActivePlotsAction::Execute()
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i< (unsigned int)windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
SetActivePlots(activePlots,
......@@ -1924,7 +1924,7 @@ SetPlotSILRestrictionAction::Execute()
if( applyToAllWindows )
{
for( unsigned int i=0; i<windowMgr->GetNumWindows(); ++i )
for( unsigned int i=0; i < (unsigned int) windowMgr->GetNumWindows(); ++i )
{
windowMgr->GetWindow(i)->GetPlotList()->
SetPlotSILRestriction(applySelectionToAllPlots);
......
......@@ -365,7 +365,7 @@ void SharedDaemon::handleConnection()
{
const JSONNode::JSONArray& array = jo["windowIds"].GetArray();
for(int i = 0; i < array.size(); ++i)
for(size_t i = 0; i < array.size(); ++i)
{
const JSONNode& node = array[i];
......@@ -509,7 +509,7 @@ void SharedDaemon::AddNewClient(const std::string &host, const stringVector &arg
if(wsocket->internalSocket()->state() != QAbstractSocket::UnconnectedState)
wsocket->internalSocket()->waitForBytesWritten();
wsocket->close();
wsocket->close("");
wsocket->internalSocket()->disconnectFromHost();
if(wsocket->internalSocket()->state() != QAbstractSocket::UnconnectedState)
wsocket->internalSocket()->waitForDisconnected();
......
......@@ -325,7 +325,7 @@ void
SaveViewAction::DeleteViews()
{
// Delete the views
for(int i = 0; i < views.size(); ++i)
for(size_t i = 0; i < views.size(); ++i)
{
if(views[i].viewType == VIEWCurve)
{
......@@ -457,7 +457,7 @@ SaveViewAction::CopyFrom(const ViewerActionBase *obj)
// Delete the views from the interface.
DeleteViewsFromInterface();
for(int i = 0; i < saveView->views.size(); ++i)
for(size_t i = 0; i < saveView->views.size(); ++i)
{
void *newView = 0;
......@@ -515,7 +515,7 @@ SaveViewAction::CopyFrom(const ViewerActionBase *obj)
void
SaveViewAction::SaveCurrentView()
{
if(views.size() < MAX_SAVED_VIEWS)
if(views.size() < (size_t)MAX_SAVED_VIEWS)
{
void *saveView;
int vt;
......@@ -649,7 +649,7 @@ SaveViewAction::AddNewView(void *v, int vt)
void
SaveViewAction::UseSavedView(int index)
{
if(index >= 0 && index < views.size())
if(index >= 0 && (size_t)index < views.size())
{
if(views[index].viewType == VIEWCurve)
{
......@@ -797,7 +797,7 @@ SaveViewAction::CreateNode(DataNode *parentNode)
// Add a node for each view that is not the default view.
intVector viewTypes;
for(int i = 0; i < views.size(); ++i)
for(size_t i = 0; i < views.size(); ++i)
{
if(views[i].viewType == VIEWCurve)
{
......
......@@ -92,7 +92,7 @@ public:
// Add all of the action groups as choices.
ViewerActionManager *actionMgr = window->GetActionManager();
stringVector names(actionMgr->GetActionGroupNames(false));
for(int i = 0; i < names.size(); ++i)
for(size_t i = 0; i < names.size(); ++i)
AddChoice(names[i].c_str());
}
......@@ -759,7 +759,7 @@ ViewerActionManager::EnableActions(ViewerWindowManagerAttributes *wma)
// object and add the new action group to the manager.
ActionGroup newAction(ag.GetName());
newAction.enabled = ag.GetVisible();
for(int j = 0; j < ag.GetActions().size(); ++j)
for(size_t j = 0; j < ag.GetActions().size(); ++j)
{
ActionIndex index = ag.GetAction(j);
if(index != ViewerRPC::MaxRPC)
......@@ -852,7 +852,7 @@ ViewerActionManager::RealizeActionGroups(bool toolbarsVisible, bool largeIcons)
for(;pos != actionGroups.end(); ++pos)
{
const ActionIndexVector &a = pos->actions;
for(int j = 0; j < a.size(); ++j)
for(size_t j = 0; j < a.size(); ++j)
{
ViewerActionBase *action = GetAction(a[j]);
if(action && action->VisualEnabled())
......@@ -939,7 +939,7 @@ ViewerActionManager::RealizeActionGroups(bool toolbarsVisible, bool largeIcons)
//
// Enable or disable the action groups based on user-settings.
//
for(i = 0; i < actionGroups.size(); ++i)
for(i = 0; i < (int)actionGroups.size(); ++i)
{
SetActionGroupEnabled(i, actionGroups[i].enabled);
}
......@@ -992,7 +992,7 @@ ViewerActionManager::UpdateActionConstruction(ViewerActionBase *action)
for(;pos != actionGroups.end(); ++pos)
{
const ActionIndexVector &a = pos->actions;
for(int j = 0; j < a.size(); ++j)
for(size_t j = 0; j < a.size(); ++j)
{
if(GetAction(a[j]) == action && action->VisualEnabled())
{
......@@ -1071,14 +1071,14 @@ ViewerActionManager::UpdateActionInformation(ViewerWindowManagerAttributes *wma)
{
wma->ClearActionConfigurations();
for(int i = 0; i < actionGroups.size(); ++i)
for(size_t i = 0; i < actionGroups.size(); ++i)
{
const ActionGroup &ag = actionGroups[i];
if(ag.name != "Customize")
{
ActionGroupDescription description(ag.name);
description.SetVisible(ag.enabled);
for(int j = 0; j < ag.actions.size(); ++j)
for(size_t j = 0; j < ag.actions.size(); ++j)
{
ViewerActionBase *action = GetAction(ag.actions[j]);
if(action && !action->CanHaveOwnToolbar())
......@@ -1198,7 +1198,7 @@ ViewerActionManager::UpdatePopup()
const ActionIndexVector &a = pos->actions;
bool hasEnabledActions = false;
ViewerWindow *win = 0;
for(int i = 0; i < a.size() && !hasEnabledActions; ++i)
for(size_t i = 0; i < a.size() && !hasEnabledActions; ++i)
{
int actionIndex = a[i];
ViewerActionBase *action = actions[actionIndex];
......@@ -1296,11 +1296,11 @@ ViewerActionManager::AddAction(ViewerActionBase *action, ActionIndex index)
void
ViewerActionManager::AddActionGroup(const ViewerActionManager::ActionGroup &group)
{
for(int i = 0; i < actionGroups.size(); ++i)
for(size_t i = 0; i < actionGroups.size(); ++i)
{
if(group.name == actionGroups[i].name)
{
for(int j = 0; j < group.actions.size(); ++j)
for(size_t j = 0; j < group.actions.size(); ++j)
actionGroups[i].AddAction(group.actions[j]);
return;
}
......@@ -1341,7 +1341,7 @@ ViewerActionManager::GetNumberOfActionGroupMemberships(ActionIndex index) const
for(pos = actionGroups.begin(); pos != actionGroups.end(); ++pos)
{
const ActionIndexVector &a = pos->actions;
for(int i = 0; i < a.size(); ++i)
for(size_t i = 0; i < a.size(); ++i)
count += ((a[i] == index) ? 1 : 0);
}
}
......@@ -1376,7 +1376,7 @@ void
ViewerActionManager::SetActionGroupEnabled(int index, bool val, bool update)
{
// Look for the named action group.
if(index >= 0 && index < actionGroups.size())
if(index >= 0 && (size_t)index < actionGroups.size())
{
// Set the action group's enabled value.
actionGroups[index].enabled = val;
......@@ -1434,7 +1434,7 @@ ViewerActionManager::SetActionGroupEnabled(int index, bool val, bool update)
bool
ViewerActionManager::GetActionGroupEnabled(int index) const
{
return (index >= 0 && index < actionGroups.size()) ? actionGroups[index].enabled : false;
return (index >= 0 && (size_t)index < actionGroups.size()) ? actionGroups[index].enabled : false;
}
// ****************************************************************************
......@@ -1591,7 +1591,7 @@ void
ViewerActionManager::ActionGroup::AddAction(ActionIndex index)
{
// Return early if the action is already in the list.
for(int i = 0; i < actions.size(); ++i)
for(size_t i = 0; i < actions.size(); ++i)
{
if(actions[i] == index)
return;
......
......@@ -629,7 +629,7 @@ ViewerConfigManager::ImportEntireState(const std::string &filename,
{
char tmp[100];
SNPRINTF(tmp, 100, "SOURCE%02d", i);
if(i < sources.size())
if(i < (int)sources.size())
{
source = sources[i];
}
......
......@@ -572,7 +572,7 @@ ViewerEngineManager::CreateEngineEx(const EngineKey &ek,
stringVector eArgs;
if (newEngine.profile.GetActiveLaunchProfile())
eArgs = newEngine.profile.GetActiveLaunchProfile()->GetArguments();
for(int s = 0; s < args.size(); ++s)
for(size_t s = 0; s < args.size(); ++s)
eArgs.push_back(args[s]);
if (newEngine.profile.GetActiveLaunchProfile())
newEngine.profile.GetActiveLaunchProfile()->SetArguments(eArgs);
......@@ -875,7 +875,7 @@ ViewerEngineManager::ConnectSim(const EngineKey &ek,
<< " ek.originalhostname=" << ek.OriginalHostName()
<< " ek.SimName=" << ek.SimName();
debug1 << " args={";
for(int i = 0; i < args.size(); ++i)
for(size_t i = 0; i < args.size(); ++i)
debug1 << args[i] << ", ";
debug1 << "} simHost=" << simHost << " simPort=" << simPort
<< " simSecurityKey=" << simSecurityKey << endl;
......@@ -1557,7 +1557,7 @@ ViewerEngineManager::ExternalRender(const ExternalRenderRequestInfo& reqInfo,
int windowID)
{
// break-out individual members of the request info
const vector<string> &plotNames = reqInfo.plotNames;
//const vector<string> &plotNames = reqInfo.plotNames;
const vector<const char*>& pluginIDsList = reqInfo.pluginIDsList;
const vector<EngineKey>& engineKeysList = reqInfo.engineKeysList;
const vector<int>& plotIdsList = reqInfo.plotIdsList;
......@@ -1578,7 +1578,7 @@ ViewerEngineManager::ExternalRender(const ExternalRenderRequestInfo& reqInfo,
map<EngineKey,vector<int> > perEnginePlotIds;
// make a pass over list of plots to make sure all associated engines exist
for (int i = 0; i < engineKeysList.size(); i++)
for (size_t i = 0; i < engineKeysList.size(); i++)
{
if (!EngineExists(engineKeysList[i]))
return false;
......@@ -1592,7 +1592,7 @@ ViewerEngineManager::ExternalRender(const ExternalRenderRequestInfo& reqInfo,
#endif
// build list of per-engine plot ids
int i;
size_t i;
for (i = 0; i < plotIdsList.size(); i++)
{
ek = engineKeysList[i];
......@@ -2731,7 +2731,7 @@ ViewerEngineManager::UpdateEngineList()
EngineList newEL;
// Add the other information about the engine.
for(i = 0; i < ids.size(); ++i)
for(i = 0; i < (int)ids.size(); ++i)
{
EngineKey ek = ids[i];
if (EngineExists(ek))
......
......@@ -486,7 +486,7 @@ class VIEWER_API ViewerEngineManager : public ViewerServerManager,
bool executing;
bool inLaunch;
int nEngines;
//int nEngines;
EngineMap engines;
std::map<EngineKey,stringVector> restartArguments;
......
......@@ -2341,7 +2341,7 @@ ViewerFileServer::CreateDatabaseCorrelation(const std::string &name,
// Add the different databases to the correlation.
QString msg;
for(int i = 0; i < dbs.size(); ++i)
for(size_t i = 0; i < dbs.size(); ++i)
{
//
// Split the database name into host and database components
......@@ -2502,7 +2502,7 @@ ViewerFileServer::GetMostSuitableCorrelation(const stringVector &dbs) const
const DatabaseCorrelation &c = databaseCorrelationList->
GetCorrelations(i);
scores[c.GetName()] = 0;
for(int j = 0; j < dbs.size(); ++j)
for(size_t j = 0; j < dbs.size(); ++j)
{
if(c.UsesDatabase(dbs[j]))
++scores[c.GetName()];
......@@ -2542,7 +2542,7 @@ ViewerFileServer::GetMostSuitableCorrelation(const stringVector &dbs) const
// since it means that it is not a trivial correlation.
//
DatabaseCorrelation *retval = 0;
if(dbs.size() == score || score > 1)
if((int)dbs.size() == score || score > 1)
retval = databaseCorrelationList->FindCorrelation(correlationName);
return retval;
......@@ -2604,10 +2604,10 @@ ViewerFileServer::PreviouslyDeclinedCorrelationCreation(
const stringVector &dbs) const
{
int index = 0;
for(int fileSet = 0; fileSet < declinedFilesLength.size();
for(size_t fileSet = 0; fileSet < declinedFilesLength.size();
++fileSet)
{
if(declinedFilesLength[fileSet] == dbs.size())
if(declinedFilesLength[fileSet] == (int)dbs.size())
{
bool same = true;
for(int i = 0; i < declinedFilesLength[fileSet] && same; ++i, ++index)
......@@ -2927,7 +2927,7 @@ ViewerFileServer::CreateNode(DataNode *parentNode,
// Map database names to source names.
const stringVector &dbNames = corr.GetDatabaseNames();
stringVector sourceIds;
for(int j = 0; j < dbNames.size(); ++j)
for(size_t j = 0; j < dbNames.size(); ++j)
{
std::map<std::string, std::string>::const_iterator pos =
dbToSource.find(dbNames[j]);
......@@ -3055,7 +3055,7 @@ ViewerFileServer::SetFromNode(DataNode *parentNode,
// database names using the sourceToDB map.
stringVector dbNames;
const stringVector &sourceNames = corr.GetDatabaseNames();
for(int j = 0; j < sourceNames.size(); ++j)
for(size_t j = 0; j < sourceNames.size(); ++j)
{
std::map<std::string,std::string>::const_iterator pos =
sourceToDB.find(sourceNames[j]);
......
......@@ -66,8 +66,8 @@
// ****************************************************************************
ViewerMultipleAction::ViewerMultipleAction(ViewerWindow *win) :
ViewerActionBase(win), children(), text(), menuText(),
toolTip(), icon()
ViewerActionBase(win), text(), menuText(),
toolTip(), icon(), children()
{
iconSpecified = false;
activeAction = 0;
......@@ -157,7 +157,7 @@ bool
ViewerMultipleAction::Enabled() const
{
bool someEnabled = false;
for(int i = 0; i < children.size() && !someEnabled; ++i)
for(size_t i = 0; i < children.size() && !someEnabled; ++i)
someEnabled |= ChoiceEnabled(i);
return someEnabled;
......@@ -279,7 +279,7 @@ ViewerMultipleAction::Update()
// Update the child actions
bool foundTrue = false;
for(int i = 0; i < children.size(); ++i)
for(size_t i = 0; i < children.size(); ++i)
{
bool choiceShouldBeEnabled = actionShouldBeEnabled ? ChoiceEnabled(i) : false;
if(choiceShouldBeEnabled)
......@@ -533,7 +533,7 @@ ViewerMultipleAction::ConstructMenu(QMenu *menu)
else
actionMenu = menu->addMenu(menuText);
for(int i = 0; i < children.size(); ++i)
for(size_t i = 0; i < children.size(); ++i)
actionMenu->addAction(children[i]);
}
......@@ -558,7 +558,7 @@ ViewerMultipleAction::RemoveFromMenu(QMenu *menu)
{
if(actionMenu != 0)
{
for(int i = 0; i < children.size(); ++i)
for(size_t i = 0; i < children.size(); ++i)
actionMenu->removeAction(children[i]);
delete actionMenu;
}
......
......@@ -194,21 +194,21 @@ ViewerPasswordWindow::authenticate(const char *username, const char *host,
debug1 << "See warning message for possible causes" << endl;
EXCEPTION0(CouldNotConnectException);
}
size_t result = 0; (void) result;
// Write output to stderr
write(STDERR_FILENO, pbuf, nread);
result = write(STDERR_FILENO, pbuf, nread);
pbuf += nread;
*pbuf = '\0';
if (strstr(buffer, "continue connecting (yes/no)?"))
{
write(fd, "yes\n", 4);
result = write(fd, "yes\n", 4);
pbuf = buffer;
}
else if (strstr(buffer, "continue connecting(yes/no)?"))
{
write(fd, "yes\n", 4);
result = write(fd, "yes\n", 4);
pbuf = buffer;
}
else if (strstr(buffer, "assword") ||
......@@ -233,8 +233,8 @@ ViewerPasswordWindow::authenticate(const char *username, const char *host,
}
}
write(fd, passwd.c_str(), passwd.size());
write(fd, "\n", 1);
result = write(fd, passwd.c_str(), passwd.size());
result = write(fd, "\n", 1);
pbuf = buffer;
// We put up the password window, have zero timeout for
......@@ -260,8 +260,8 @@ ViewerPasswordWindow::authenticate(const char *username, const char *host,
}
}
write(fd, passphr.c_str(), passphr.size());
write(fd, "\n", 1);
result = write(fd, passphr.c_str(), passphr.size());
result = write(fd, "\n", 1);
pbuf = buffer;
// We put up the password window, have zero timeout for
......
......@@ -220,7 +220,7 @@ ViewerPlot::ViewerPlot(const int type_,ViewerPlotPluginInfo *viewerPluginInfo_,
//
// Make sure the state is not negative.
//
int state = (plotState < 0) ? 0 : plotState;
//int state = (plotState < 0) ? 0 : plotState;
//
// Initialize some values.
......@@ -1670,7 +1670,7 @@ ViewerPlot::SetVariableName(const std::string &name)
avtSILRestriction_p new_sil =
new avtSILRestriction(silr);
int topSet = 0;
for (int i = 0; i < new_sil->GetWholes().size(); i++)
for (size_t i = 0; i < new_sil->GetWholes().size(); i++)
{
current =
new_sil->GetSILSet(new_sil->GetWholes()[i]);
......@@ -1742,7 +1742,7 @@ ViewerPlot::SetVariableName(const std::string &name)
OperatorPluginManager *oPM = GetOperatorPluginManager();
for (int j = 0; j < oPM->GetNEnabledPlugins(); j++)
{
const std::string &mesh = GetMeshName();
//const std::string &mesh = GetMeshName();
std::string id = oPM->GetEnabledID(j);
CommonOperatorPluginInfo *info = oPM->GetCommonPluginInfo(id);
const avtDatabaseMetaData *md = GetMetaData();
......
This diff is collapsed.
......@@ -1146,7 +1146,7 @@ ViewerQueryManager::DatabaseQuery(const MapNode &queryParams)
// for queries. Regenerate them with SLB.
//
bool clearedActor = false;
for (int i = 0 ; i < plotIds.size() ; i++)
for (size_t i = 0 ; i < plotIds.size() ; i++)
{
int plotId = plotIds[i];
ViewerPlot *plot = plist->GetPlot(plotId);
......@@ -1272,7 +1272,7 @@ ViewerQueryManager::DatabaseQuery(const MapNode &queryParams)
{
retry = false;
intVector networkIds;
for (int i = 0 ; i < plotIds.size() ; i++)
for (size_t i = 0 ; i < plotIds.size() ; i++)
{
int plotId = plotIds[i];
ViewerPlot *oplot = plist->GetPlot(plotId);
......@@ -1332,7 +1332,7 @@ ViewerQueryManager::DatabaseQuery(const MapNode &queryParams)
// is created. This situation requires re-execution of the
// plot that is being queried.
//
for (int i = 0 ; i < plotIds.size() ; i++)
for (size_t i = 0 ; i < plotIds.size() ; i++)
plist->GetPlot(plotIds[i])->ClearCurrentActor();
win->GetPlotList()->UpdateFrame();
numAttempts++;
......@@ -1388,7 +1388,7 @@ ViewerQueryManager::DatabaseQuery(const MapNode &queryParams)
ViewerPlotList *plist = win->GetPlotList();
intVector plotIDs;
plist->GetActivePlotIDs(plotIDs);
for (int i = 0 ; i < plotIDs.size() ; i++)
for (size_t i = 0 ; i < plotIDs.size() ; i++)
{
int plotId = plotIDs[i];
ViewerPlot *plot = plist->GetPlot(plotId);
......@@ -2139,7 +2139,7 @@ ViewerQueryManager::ComputePick(PICK_POINT_INFO *ppi, const int dom,
GetUniqueVars(useTheseVars, activeVar, uniqueVars, plot->GetMetaData());
stringVector validVars;
stringVector invalidVars;
for (int i = 0; i < uniqueVars.size(); i++)
for (size_t i = 0; i < uniqueVars.size(); i++)
{
if (plot->GetVarType(uniqueVars[i]) != AVT_UNKNOWN_TYPE)
validVars.push_back(uniqueVars[i]);
......@@ -2458,10 +2458,10 @@ ViewerQueryManager::ComputePick(PICK_POINT_INFO *ppi, const int dom,
if (!GetPlotPluginManager()->PluginAvailable(
"Spreadsheet_1.0"))
{
static bool issuedWarning = false;
//static bool issuedWarning = false;
Error(tr("Could not create a spreadsheet with the pick, "
"because the spreadsheet plugin is not available."));
issuedWarning = true;
//issuedWarning = true;
return retval;
}
......@@ -2633,7 +2633,7 @@ ViewerQueryManager::ComputePick(PICK_POINT_INFO *ppi, const int dom,
}
if (haveArray)
{
int winId = win->GetWindowId();
//int winId = win->GetWindowId();
ViewerWindow *resWin =
ViewerWindowManager::Instance()->GetTimeQueryWindow(-1);
if (resWin == NULL)
......@@ -2646,11 +2646,11 @@ ViewerQueryManager::ComputePick(PICK_POINT_INFO *ppi, const int dom,
if (!GetPlotPluginManager()->PluginAvailable(
"Histogram_1.0"))
{
static bool issuedWarning = false;
//static bool issuedWarning = false;
Error(tr("Could not create a histogram of the array "
"variable, because the Histogram plugin is not "
"available."));
issuedWarning = true;
//issuedWarning = true;
return retval;
}
......@@ -3351,7 +3351,7 @@ void
ViewerQueryManager::HandlePickCache()
{
handlingCache = true;
for (int i = 0; i < pickCache.size(); i++)
for (size_t i = 0; i < pickCache.size(); i++)
{
Pick(&pickCache[i]);
}
......@@ -3878,7 +3878,7 @@ GetUniqueVars(const stringVector &vars, const string &activeVar,
uniqueVars.push_back(activeVar);
return;
}
int i, j;
size_t i, j;
set<string> uniqueVarsSet;
for (i = 0; i < vars.size(); i++)
{
......@@ -4253,7 +4253,7 @@ ViewerQueryManager::VerifyQueryVariables(const string &qName,
int allowedTypes = queryTypes->AllowedVarsForQuery(qName);
if (allowedTypes > 0)
{
for (i = 0; i < varTypes.size() && badIndex == -1; i++)
for (i = 0; i < (int)varTypes.size() && badIndex == -1; i++)
{
int vt = (int) pow(2.0, varTypes[i]);
if (!(allowedTypes & vt))
......@@ -5224,7 +5224,7 @@ ViewerQueryManager::VerifySingleInputQuery(ViewerPlotList *plist, const int plot
// to be modified to potentially use a different state for each
// dbname/var pair.
//
for (int j = 0; j < uniqueVars.size(); j++)
for (size_t j = 0; j < uniqueVars.size(); j++)
{
varTypes.push_back((int)
fs->DetermineVarType(host, dbname, uniqueVars[j], state));
......@@ -5241,7 +5241,7 @@ ViewerQueryManager::VerifySingleInputQuery(ViewerPlotList *plist, const int plot