Commit 43f55dc3 authored by hkrishna's avatar hkrishna

warning fixes for gui directory

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23636 18c085ea-50e0-402c-830e-de6fd14e8384
parent cd0b3657
......@@ -728,7 +728,7 @@ GUIBase::GetStateForSource(const QualifiedFilename &source) const
// the correlation that we just found and the active time
// state for that correlation.
//
for(int i = 0; i < windowInfo->GetTimeSliders().size(); ++i)
for(size_t i = 0; i < windowInfo->GetTimeSliders().size(); ++i)
{
if(tsNames[i] == sourceStr)
{
......@@ -780,7 +780,7 @@ GUIBase::GetTimeSliderStateForDatabaseState(const std::string &activeTSName,
if(activeTSName != "")
{
WindowInformation *windowInfo = GetViewerState()->GetWindowInformation();
//WindowInformation *windowInfo = GetViewerState()->GetWindowInformation();
// Try and find a correlation for the active time slider so we
// can get the number of states in the correlation.
......
......@@ -69,6 +69,7 @@ public:
_name(n), _parent(p), _id(i), _delegateType(dt)
{
}
virtual ~RowInfo() {}
QString name() const { return _name; }
int parent() const { return _parent; }
......@@ -551,7 +552,7 @@ int
KeyframeDataModel::currentIndex() const
{
int curIndex = -1;
for(int i = 0; i < windowInfo->GetTimeSliders().size(); ++i)
for(size_t i = 0; i < windowInfo->GetTimeSliders().size(); ++i)
{
if(windowInfo->GetTimeSliders()[i] == KF_TIME_SLIDER)
{
......
......@@ -1828,7 +1828,7 @@ bool
MovieTemplateConfig::SequenceGetNameForIndex(int index, std::string &name) const
{
StringMovieSequenceMap::const_iterator it = sequences.begin();
int i = 0;
//int i = 0;
for(int i = 0; it != sequences.end(); ++it, ++i)
{
if(index == i)
......@@ -1867,7 +1867,7 @@ MovieTemplateConfig::SequenceGetIndexForName(const std::string &name,
int &index) const
{
StringMovieSequenceMap::const_iterator it = sequences.begin();
int i = 0;
//int i = 0;
for(int i = 0; it != sequences.end(); ++it, ++i)
{
if(it->first == name)
......@@ -1963,7 +1963,7 @@ MovieTemplateConfig::GetSequence(const std::string &name) const
bool
MovieTemplateConfig::SequenceAdd(int type, std::string &name)
{
const char *mName = "MovieTemplateConfig::SequenceAdd1";
//const char *mName = "MovieTemplateConfig::SequenceAdd1";
bool ret = false;
MovieSequence *s = MovieSequenceFactory::Instance()->Create(type);
......
......@@ -87,9 +87,9 @@ struct QualifiedFilename
std::string PathAndFile() const;
bool CanAccess() const { return (flag & 1) == 1; }
void SetAccess(bool val) { flag = (flag & 0xfe | (val?1:0)); }
void SetAccess(bool val) { flag = ((flag & 0xfe) | (val?1:0)); }
bool IsVirtual() const { return (flag & 2) == 2; }
void SetVirtual(bool val) { flag = (flag & 0xfd | (val?2:0)); }
void SetVirtual(bool val) { flag = ((flag & 0xfd) | (val?2:0)); }
std::string host;
std::string path;
......
......@@ -577,8 +577,8 @@ QvisAbstractOpacityBar::resizeEvent(QResizeEvent*)
framerect.setRight(framerect.right() -10);
setFrameRect(framerect);
int w=contentsRect().width();
int h=contentsRect().height();
//int w=contentsRect().width();
//int h=contentsRect().height();
imageDirty();
update();
......
......@@ -266,7 +266,7 @@ QvisApplication::macEventFilter(EventHandlerCallRef er, EventRef event)
// Inject a Carbon event to make the application active.
CreateEvent(NULL, kEventClassApplication, kEventAppActivated, GetCurrentEventTime(),
NULL, &request_make_app_active);
0, &request_make_app_active);
PostEventToQueue(GetCurrentEventQueue(), request_make_app_active, kEventPriorityHigh);
// Inject a directive to exit a sub-event loop that we'll be creating.
QTimer::singleShot(10, this, SLOT(exitTheLoop()));
......
......@@ -303,7 +303,7 @@ QvisCMFEWizard::Exec()
int
QvisCMFEWizard::nextId() const
{
int id;
int id = -1;
switch(currentId())
{
......@@ -396,9 +396,9 @@ QvisCMFEWizard::validateCurrentPage()
if( decision_exprtype != EXPRESSION_SIMPLE)
{
// Check for multiple donors.
if( (decision_donorType == DONOR_SINGLE_DATABASE ||
if( ((decision_donorType == DONOR_SINGLE_DATABASE ||
decision_donorType == DONOR_MULTIPLE_DATABASES) &&
donorList->count() > 1 || // Multiple donors
donorList->count() > 1) || // Multiple donors
// One donor in the list and one ready to be added
(donorList->count() == 1 &&
decision_donorDatabase != "" && decision_variable != "" ) )
......@@ -549,9 +549,9 @@ QvisCMFEWizard::initializePage(int pageId)
bool singleDonor;
// Multiple donors
if( (decision_donorType == DONOR_SINGLE_DATABASE ||
if( ((decision_donorType == DONOR_SINGLE_DATABASE ||
decision_donorType == DONOR_MULTIPLE_DATABASES) &&
donorList->count() > 1 || // Multiple donors
donorList->count() > 1) || // Multiple donors
// One donor in the list and one ready to be added
(donorList->count() == 1 &&
decision_donorDatabase != "" && decision_variable != "" ) )
......@@ -1233,7 +1233,7 @@ QvisCMFEWizard::UpdateSourceList()
int target_index =-1;
int donor_index =-1;
NameSimplifier simplifier;
for(int i = 0; i < sources.size(); ++i)
for(size_t i = 0; i < sources.size(); ++i)
{
if(sources[i] == tsrc)
target_index = i;
......@@ -1251,7 +1251,7 @@ QvisCMFEWizard::UpdateSourceList()
targetDatabase->clear();
donorDatabase->clear();
for(int i = 0; i < shortSources.size(); ++i)
for(size_t i = 0; i < shortSources.size(); ++i)
{
targetDatabase->addItem(shortSources[i].c_str());
donorDatabase->addItem(shortSources[i].c_str());
......@@ -1485,7 +1485,7 @@ QvisCMFEWizard::GetMeshForTargetDatabase(void)
std::string filename = qfilename.FullName();
if(filename == "")
filename == windowInfo->GetActiveSource();
filename = windowInfo->GetActiveSource();
if (filename == "notset")
return "";
......@@ -1830,7 +1830,7 @@ QvisCMFEWizard::targetDatabaseChanged(int val)
return;
}
const stringVector &sources = globalAtts->GetSources();
if(val >= 0 && val < sources.size())
if(val >= 0 && (size_t)val < sources.size())
{
//
// Make the file that we reopened be the new open file. Since we're
......@@ -1875,7 +1875,7 @@ QvisCMFEWizard::donorDatabaseChanged(int val)
return;
}
const stringVector &sources = globalAtts->GetSources();
if(val >= 0 && val < sources.size())
if(val >= 0 && (size_t)val < sources.size())
{
//
// Make the file that we reopened be the new open file. Since we're
......@@ -2159,7 +2159,7 @@ QvisCMFEWizard::nonOverlapTxtChanged(const QString &s)
void
QvisCMFEWizard::nonOverlapVarChanged(const QString &s)
{
bool okay = false;
//bool okay = false;
decision_fillvar = s.toStdString();
}
......@@ -2216,9 +2216,9 @@ QvisCMFEWizard::exprTypeChanged(int v)
button(QWizard::FinishButton)->setEnabled(false);
// Single donor or multiple donors
if( (decision_donorType == DONOR_SINGLE_DATABASE ||
if( ((decision_donorType == DONOR_SINGLE_DATABASE ||
decision_donorType == DONOR_MULTIPLE_DATABASES) &&
donorList->count() > 1 || // Multiple donors
donorList->count() > 1) || // Multiple donors
// One donor in the list and one ready to be added
(donorList->count() == 1 &&
decision_donorDatabase != "" && decision_variable != "" ) )
......@@ -2417,7 +2417,7 @@ QvisCMFEWizard::addDonor()
// Do not add a duplicate donor.
for (int i = 0; i < donorList->count(); i++)
{
if( item = donorList->item(i) )
if( (item = donorList->item(i)) )
{
if( donor == std::string( item->text().toLatin1().data() ) )
{
......
......@@ -115,7 +115,7 @@ QvisColorButton::QvisColorButton(QWidget *parent, const void *data) :
QvisColorButton::~QvisColorButton()
{
// Remove the "this" pointer from the vector.
size_t index;
size_t index = 0;
bool notFound = true;
for(size_t i = 0; i < buttons.size() && notFound; ++i)
{
......@@ -464,7 +464,7 @@ QvisColorButton::popupPressed()
// Show the popup menu.
popup->move(menuX, menuY);
popup->show();
setDown(false);
setDown(FALSE);
}
}
......
......@@ -340,7 +340,7 @@ void
QvisColorManagerWidget::setEntry(int index, const QString &name,
const QColor &color, int opacity)
{
if(index >= 0 && index < colorEntries.size())
if(index >= 0 && (size_t)index < colorEntries.size())
{
ColorEntry *entry = colorEntries[index];
QString tempName(" ");
......@@ -384,7 +384,7 @@ QvisColorManagerWidget::setEntry(int index, const QString &name,
void
QvisColorManagerWidget::setAttributeName(int index, const QString &name)
{
if(index >= 0 && index < colorEntries.size())
if(index >= 0 && (size_t)index < colorEntries.size())
{
QString tempName(" ");
tempName += name;
......@@ -414,7 +414,7 @@ QvisColorManagerWidget::setAttributeName(int index, const QString &name)
void
QvisColorManagerWidget::setColor(int index, const QColor &color)
{
if(index >= 0 && index < colorEntries.size())
if(index >= 0 && (size_t)index < colorEntries.size())
{
colorEntries[index]->colorBox->setButtonColor(color);
colorEntries[index]->opacitySlider->setGradientColor(color);
......@@ -441,7 +441,7 @@ QvisColorManagerWidget::setColor(int index, const QColor &color)
void
QvisColorManagerWidget::setOpacity(int index, int opacity)
{
if(index >= 0 && index < colorEntries.size())
if(index >= 0 && (size_t)index < colorEntries.size())
{
colorEntries[index]->opacitySlider->setValue(opacity);
}
......@@ -553,7 +553,7 @@ QvisColorManagerWidget::name(int index) const
{
QString retval;
if(index >= 0 && index < colorEntries.size())
if(index >= 0 && (size_t)index < colorEntries.size())
{
retval = colorEntries[index]->nameLabel->text();
}
......@@ -582,7 +582,7 @@ QvisColorManagerWidget::color(int index) const
{
QColor retval(0,0,0);
if(index >= 0 && index < colorEntries.size())
if(index >= 0 && (size_t)index < colorEntries.size())
{
retval = colorEntries[index]->colorBox->buttonColor();
}
......@@ -611,7 +611,7 @@ QvisColorManagerWidget::opacity(const int index) const
{
int retval = 255;
if(index >= 0 && index < colorEntries.size())
if(index >= 0 && (size_t)index < colorEntries.size())
{
retval = colorEntries[index]->opacitySlider->value();
}
......@@ -646,7 +646,7 @@ QvisColorManagerWidget::selectedColor(const QColor &color,
int index = (int)((long)userData);
// Change the gradient color of the opacity slider.
if(index >= 0 && index < colorEntries.size())
if(index >= 0 && (size_t)index < colorEntries.size())
colorEntries[index]->opacitySlider->setGradientColor(color);
// emit the colorChanged signal.
......
......@@ -100,7 +100,7 @@ QvisDatabaseCorrelationListWindow::~QvisDatabaseCorrelationListWindow()
{
correlationList = 0;
int i;
size_t i;
for(i = 0; i < windowsToDelete.size(); ++i)
delete windowsToDelete[i];
windowsToDelete.clear();
......@@ -256,7 +256,7 @@ QvisDatabaseCorrelationListWindow::UpdateWindow(bool doAll)
// of correlation names.
//
NameSimplifier simplifier;
int i, nC = correlationList->GetNumCorrelations();
size_t i, nC = correlationList->GetNumCorrelations();
for(i = 0; i < nC; ++i)
{
const DatabaseCorrelation &c = correlationList->GetCorrelations(i);
......@@ -432,7 +432,7 @@ QvisDatabaseCorrelationListWindow::showMinimized()
QvisPostableWindowObserver::showMinimized();
// Show any correlation windows minimized too.
for(int i = 0; i < activeCorrelationWindows.size(); ++i)
for(size_t i = 0; i < activeCorrelationWindows.size(); ++i)
activeCorrelationWindows[i]->showMinimized();
}
......@@ -457,7 +457,7 @@ QvisDatabaseCorrelationListWindow::showNormal()
QvisPostableWindowObserver::showNormal();
// Show any correlation windows minimized too.
for(int i = 0; i < activeCorrelationWindows.size(); ++i)
for(size_t i = 0; i < activeCorrelationWindows.size(); ++i)
activeCorrelationWindows[i]->showNormal();
}
......@@ -689,7 +689,7 @@ QvisDatabaseCorrelationListWindow::deleteWindow(QvisWindowBase *win)
void
QvisDatabaseCorrelationListWindow::delayedDeleteWindows()
{
for(int i = 0; i < windowsToDelete.size(); ++i)
for(size_t i = 0; i < windowsToDelete.size(); ++i)
delete windowsToDelete[i];
windowsToDelete.clear();
}
......@@ -166,7 +166,7 @@ QvisDatabaseCorrelationWindow::CreateWidgets(
topLayout->addLayout(srcLayout);
srcLayout->setSpacing(5);
const int S[] = {1, 5, 1, 1, 5};
int i;
size_t i;
for(i = 0; i < 5; ++i)
srcLayout->setRowStretch(i, S[i]);
srcLayout->addWidget(new QLabel(tr("Sources"), central), 0, 0);
......@@ -206,7 +206,7 @@ QvisDatabaseCorrelationWindow::CreateWidgets(
correlatedSourcesListBox = new QListWidget(central);
correlatedSourcesListBox->setSelectionMode(QAbstractItemView::MultiSelection);
const stringVector &dbs = correlation.GetDatabaseNames();
for(i = 0; i < correlation.GetNumDatabases(); ++i)
for(i = 0; i < (size_t)correlation.GetNumDatabases(); ++i)
correlatedSourcesListBox->addItem(longToShort[dbs[i]].c_str());
if(dbs.size() > 0)
correlatedSourcesListBox->setCurrentRow(0);
......@@ -320,8 +320,8 @@ QvisDatabaseCorrelationWindow::TransferItems(QListWidget *srcLB, QListWidget *de
{
stringVector src;
stringVector dest;
int i;
for(i = 0; i < srcLB->count(); ++i)
size_t i;
for(i = 0; i < (size_t)srcLB->count(); ++i)
{
if(srcLB->item(i)->isSelected())
dest.push_back(srcLB->item(i)->text().toStdString());
......@@ -329,7 +329,7 @@ QvisDatabaseCorrelationWindow::TransferItems(QListWidget *srcLB, QListWidget *de
src.push_back(srcLB->item(i)->text().toStdString());
}
for(i = 0; i < destLB->count(); ++i)
for(i = 0; i < (size_t)destLB->count(); ++i)
dest.push_back(destLB->item(i)->text().toStdString());
srcLB->blockSignals(true);
......@@ -475,7 +475,7 @@ QvisDatabaseCorrelationWindow::actionClicked()
//
NameSimplifier simplifier;
const stringVector &sources = GetViewerState()->GetGlobalAttributes()->GetSources();
int i;
size_t i;
for(i = 0; i < sources.size(); ++i)
simplifier.AddName(sources[i]);
stringVector shortSources;
......@@ -485,7 +485,7 @@ QvisDatabaseCorrelationWindow::actionClicked()
shortToLong[shortSources[i]] = sources[i];
// Get the sources from the correlated source list.
for(i = 0; i < correlatedSourcesListBox->count(); ++i)
for(i = 0; i < (size_t)correlatedSourcesListBox->count(); ++i)
{
std::string srcName(correlatedSourcesListBox->item(i)->text().toStdString());
dbs.push_back(shortToLong[srcName]);
......
......@@ -110,7 +110,7 @@ QvisElementButton::QvisElementButton(QWidget *parent, const void *data) :
QvisElementButton::~QvisElementButton()
{
// Remove the "this" pointer from the vector.
size_t index;
size_t index = 0;
bool notFound = true;
for(size_t i = 0; i < buttons.size() && notFound; ++i)
{
......@@ -299,7 +299,7 @@ QvisElementButton::popupPressed()
// Show the popup menu.
sharedpopup->move(menuX, menuY);
sharedpopup->show();
setDown(false);
setDown(FALSE);
}
}
......
......@@ -74,7 +74,7 @@ QvisEngineWindow::QvisEngineWindow(EngineList *engineList,
const QString &caption, const QString &shortName, QvisNotepadArea *notepad) :
QvisPostableWindowObserver(engineList, caption, shortName, notepad,
QvisPostableWindowObserver::NoExtraButtons),
activeEngine(""), statusMap()
statusMap(), activeEngine("")
{
engines = engineList;
caller = engines;
......@@ -346,7 +346,7 @@ QvisEngineWindow::UpdateWindow(bool doAll)
engineCombo->blockSignals(true);
engineCombo->clear();
int current = -1;
for(int i = 0; i < host.size(); ++i)
for(size_t i = 0; i < host.size(); ++i)
{
QString temp(host[i].c_str());
if (!sim[i].empty())
......
......@@ -443,7 +443,7 @@ QvisExportDBWindow::UpdateWindow(bool doAll)
case ExportDBAttributes::ID_db_type:
{
fileFormatComboBox->blockSignals(true);
int count = fileFormatComboBox->count();
//int count = fileFormatComboBox->count();
fileFormatComboBox->clear();
int nTypes = dbPluginInfoAtts->GetTypes().size();
int curItem = -1;
......@@ -510,7 +510,7 @@ QvisExportDBWindow::UpdateVariablesList()
{
const stringVector &vars = exportDBAtts->GetVariables();
std::string allVars;
for (int i = 0; i < vars.size(); i++)
for (size_t i = 0; i < vars.size(); i++)
{
allVars += vars[i];
if(i < vars.size()-1)
......
......@@ -437,7 +437,7 @@ QvisFileOpenDialog::exec()
show();
in_loop = true;
in_loop = TRUE;
QEventLoop eventLoop;
connect(this, SIGNAL(quitloop()),
&eventLoop, SLOT(quit()));
......
......@@ -843,7 +843,7 @@ QvisFilePanel::UpdateWindowInfo(bool doAll)
//
// Try and find a correlation for the active time slider.
//
int activeTS = windowInfo->GetActiveTimeSlider();
//int activeTS = windowInfo->GetActiveTimeSlider();
// activeSource changed. Update the file server.
if(windowInfo->IsSelected(WindowInformation::ID_activeSource) || doAll)
......@@ -1175,7 +1175,7 @@ QvisFilePanel::ExpandDatabaseItemUsingVirtualDBDefinition(QvisFilePanelItem *ite
// Get the virtual file definition instead of reading the metadata.
stringVector files(fileServer->GetVirtualFileDefinition(item->file));
for(int i = 0; i < files.size(); ++i)
for(size_t i = 0; i < files.size(); ++i)
{
QString label(files[i].c_str());
QvisFilePanelItem *fi = new QvisFilePanelItem(item, label, item->file,
......@@ -1233,7 +1233,7 @@ QvisFilePanel::CreateItemLabel(const avtDatabaseMetaData *md, int ts,
if(timeStateFormat.GetDisplayMode() == TimeFormat::Cycles)
{
int cycle = (ts < md->GetCycles().size()) ? md->GetCycles()[ts] : ts;
int cycle = ((size_t)ts < md->GetCycles().size()) ? md->GetCycles()[ts] : ts;
if(useVirtualDBInformation && md->GetIsVirtualDatabase())
{
QualifiedFilename name(md->GetTimeStepNames()[ts]);
......@@ -1245,8 +1245,8 @@ QvisFilePanel::CreateItemLabel(const avtDatabaseMetaData *md, int ts,
}
else if(timeStateFormat.GetDisplayMode() == TimeFormat::Times)
{
double t = (ts < md->GetTimes().size()) ? md->GetTimes()[ts] : double(ts);
bool accurate = (ts < md->GetTimes().size()) ?
double t = ((size_t)ts < md->GetTimes().size()) ? md->GetTimes()[ts] : double(ts);
bool accurate = ((size_t)ts < md->GetTimes().size()) ?
md->IsTimeAccurate(ts) : false;
if(useVirtualDBInformation && md->GetIsVirtualDatabase())
{
......@@ -1260,9 +1260,9 @@ QvisFilePanel::CreateItemLabel(const avtDatabaseMetaData *md, int ts,
}
else if(timeStateFormat.GetDisplayMode() == TimeFormat::CyclesAndTimes)
{
int cycle = (ts < md->GetCycles().size()) ? md->GetCycles()[ts] : ts;
double t = (ts < md->GetTimes().size()) ? md->GetTimes()[ts] : double(ts);
bool accurate = (ts < md->GetTimes().size()) ?
int cycle = ((size_t)ts < md->GetCycles().size()) ? md->GetCycles()[ts] : ts;
double t = ((size_t)ts < md->GetTimes().size()) ? md->GetTimes()[ts] : double(ts);
bool accurate = ((size_t)ts < md->GetTimes().size()) ?
md->IsTimeAccurate(ts) : false;
if(useVirtualDBInformation && md->GetIsVirtualDatabase())
{
......@@ -3603,7 +3603,7 @@ FileTree::FileTreeNode::HasChildrenOfType(int type)
bool
FileTree::FileTreeNode::HasNodeNameExceeding(int len) const
{
if(nodeName.size() > len)
if(nodeName.size() > (size_t)len)
return true;
// Check the children.
......
......@@ -490,7 +490,7 @@ QvisFileSelectionWindow::UpdateSelectedFileList()
QualifiedFilenameVector::const_iterator pos;
bool needsHost = false;
bool needsPath = false;
int i;
size_t i;
//
// Search through the list of selected files and see if we'll need to
......@@ -614,7 +614,7 @@ QvisFileSelectionWindow::setEnabled(bool val)
void
QvisFileSelectionWindow::okClicked()
{
int i;
size_t i;
// Hide the remove path window.
recentPathsRemovalWindow->hide();
......
......@@ -380,7 +380,7 @@ QvisFileWindowBase::UpdateComboBox(QComboBox *cb, const stringVector &s,
cb->clear();
// Populate the combo box.
int i;
size_t i;
for(i = 0; i < s.size(); ++i)
cb->addItem(s[i].c_str());
......@@ -720,7 +720,7 @@ QvisFileWindowBase::UpdateHostComboBox()
else
hostNames = p.SplitHostPattern(p.GetHost());
for (int k = 0; k < hostNames.size(); ++k)
for (size_t k = 0; k < hostNames.size(); ++k)
{
if(std::find(hosts.begin(), hosts.end(), hostNames[k]) == hosts.end())
hosts.push_back(hostNames[k]);
......@@ -732,7 +732,7 @@ QvisFileWindowBase::UpdateHostComboBox()
//
if(invalidHosts.size() > 0)
{
for(int i = 0; i < invalidHosts.size(); ++i)
for(size_t i = 0; i < invalidHosts.size(); ++i)
{
stringVector::iterator pos = std::find(hosts.begin(), hosts.end(),
invalidHosts[i]);
......@@ -1537,7 +1537,7 @@ QvisFileWindowBase::GetVirtualDatabaseDefinitions(
// Add the definitions for all virtual files to the map.
defs.clear();
for(int i = 0; i < files.size(); ++i)
for(size_t i = 0; i < files.size(); ++i)
{
if(files[i].IsVirtual())
{
......@@ -1580,7 +1580,7 @@ QvisFileWindowBase::CheckForNewStates()
// See if the open file is in the intermediate file list and if it is
// in there and it is a virtual file, check for new states on the viewer.
//
for(int i = 0; i < intermediateFileList.size(); ++i)
for(size_t i = 0; i < intermediateFileList.size(); ++i)
{
if(intermediateFileList[i].IsVirtual())
{
......@@ -1785,7 +1785,7 @@ QvisFileWindowBase::changeDirectory(QListWidgetItem *item)
}
else
{
int separatorPos = newPath.rfind(separator);
size_t separatorPos = newPath.rfind(separator);
// If the last character is a slash, remove it.
if(separatorPos == newPath.size() - 1)
newPath = newPath.substr(separatorPos);
......
......@@ -1021,7 +1021,7 @@ QvisGUIApplication::QvisGUIApplication(int &argc, char **argv, ViewerProxy *prox
QvisGUIApplication::~QvisGUIApplication()
{
int i;
size_t i;
#if !defined(_WIN32) && !defined(__APPLE__)
// Delete the windows.
for(WindowBaseMap::iterator pos = otherWindows.begin();
......@@ -1080,7 +1080,7 @@ QvisGUIApplication::~QvisGUIApplication()
delete mainApp;
// Delete the args for QT
for (i = 0 ; i < qt_argc ; i++)
for (i = 0 ; i < (size_t)qt_argc ; i++)
{
if (qt_argv[i])
free(qt_argv[i]);
......@@ -4428,7 +4428,7 @@ QvisGUIApplication::WriteConfigFile(const char *filename)
void
QvisGUIApplication::WritePluginWindowConfigs(DataNode *parentNode)
{
int i;
size_t i;
// Iterate through each plot window and have it add its window information
// to the config file data.
......@@ -5859,7 +5859,7 @@ QvisGUIApplication::GetVirtualDatabaseDefinitions(
// Add the definitions for all virtual files to the map.
defs.clear();
for(int i = 0; i < files.size(); ++i)
for(size_t i = 0; i < files.size(); ++i)
{
if(files[i].IsVirtual())
{
......@@ -5923,7 +5923,7 @@ QvisGUIApplication::RefreshFileList()
//
std::map<QualifiedFilename, bool> paths;
const QualifiedFilenameVector &appliedFiles = fileServer->GetAppliedFileList();
int i;
size_t i;
for(i = 0; i < appliedFiles.size(); ++i)
{
QualifiedFilename temp(appliedFiles[i]);
......@@ -6168,7 +6168,7 @@ QvisGUIApplication::LoadFile(QualifiedFilename &f, bool addDefaultPlots)
// See if the file that we want to open is in the virtual
// file definition.
for(int state = 0; state < def.size(); ++state)
for(size_t state = 0; state < def.size(); ++state)
{
if(f.filename == def[state])
{
......@@ -6467,7 +6467,7 @@ QvisGUIApplication::SaveSettings()
void
QvisGUIApplication::ActivatePlotWindow(int index)
{
if(index >= 0 && index < plotWindows.size())
if(index >= 0 && (size_t)index < plotWindows.size())
{
EnsurePlotWindowIsCreated(index);
plotWindows[index]->show();
......@@ -6494,7 +6494,7 @@ QvisGUIApplication::ActivatePlotWindow(int index)
void
QvisGUIApplication::ActivateOperatorWindow(int index)
{
if(index >= 0 && index < operatorWindows.size())
if(index >= 0 && (size_t)index < operatorWindows.size())
{
EnsureOperatorWindowIsCreated(index);
operatorWindows[index]->show();
......@@ -6554,7 +6554,7 @@ QvisGUIApplication::IconifyWindows(bool isSpontaneous)
mainWin->showMinimized();
#if !defined(_WIN32)
int index;
size_t index;
// Iconify all of the regular windows.
for(WindowBaseMap::iterator pos = otherWindows.begin();
......@@ -6615,7 +6615,7 @@ QvisGUIApplication::DeIconifyWindows()
mainWin->showNormal();
#if !defined(_WIN32)
int index;
size_t index;
// deIconify all of the regular windows.
for(WindowBaseMap::iterator pos = otherWindows.begin();
......@@ -7656,7 +7656,7 @@ QvisGUIApplication::SendInterface()
debug5 << "GUI info: " << info->GetClientName().c_str()
<< endl;
debug5 << "methods:" << endl;
for(int j = 0; j < info->GetMethodNames().size(); ++j)
for(size_t j = 0; j < info->GetMethodNames().size(); ++j)
{
debug5 << "\t" << info->GetMethod(j).c_str() << "("
<< info->GetMethodPrototype(j).c_str() << ")" << endl;
......@@ -7696,7 +7696,7 @@ void
QvisGUIApplication::HandleClientMethod()
{
ClientMethod *method = GetViewerState()->GetClientMethod();
int index;
size_t index;
if(method->GetMethodName() == "_QueryClientInformation")
{
......@@ -7934,7 +7934,7 @@ std::string
QuoteSpaces(const std::string &s)
{
bool nospaces = true;
for(int i = 0; i < s.size() && nospaces; ++i)
for(size_t i = 0; i < s.size() && nospaces; ++i)
nospaces &= (s[i] != ' ');
std::string retval(s);
......@@ -7986,7 +7986,7 @@ GetMovieCommandLine(const MovieAttributes *movieAtts, stringVector &args)
// iterate over the formats
args.push_back("-format");
const stringVector &fmt = movieAtts->GetFileFormats();
int i;
size_t i;
std::string F;
for(i = 0; i < fmt.size(); ++i)
{
......@@ -8106,7 +8106,7 @@ UpdateCurrentWindowSizes(MovieAttributes *movieAtts, int currentWidth,
intVector heights(movieAtts->GetHeights());
const unsignedCharVector &useCurrentSize = movieAtts->GetUseCurrentSize();
const doubleVector &scales = movieAtts->GetScales();