Commit f6fbb749 authored by hkrishna's avatar hkrishna

Adding fixes to Qt5Support

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23645 18c085ea-50e0-402c-830e-de6fd14e8384
parent ccb6e37b
......@@ -464,7 +464,7 @@ QvisColorButton::popupPressed()
// Show the popup menu.
popup->move(menuX, menuY);
popup->show();
setDown(FALSE);
setDown(false);
}
}
......
......@@ -299,7 +299,7 @@ QvisElementButton::popupPressed()
// Show the popup menu.
sharedpopup->move(menuX, menuY);
sharedpopup->show();
setDown(FALSE);
setDown(false);
}
}
......
......@@ -437,7 +437,7 @@ QvisFileOpenDialog::exec()
show();
in_loop = TRUE;
in_loop = true;
QEventLoop eventLoop;
connect(this, SIGNAL(quitloop()),
&eventLoop, SLOT(quit()));
......
......@@ -454,7 +454,7 @@ void
QvisOpacitySlider::drawSliderGroove(QPainter *p, int x, int y, int w, int,
int c)
{
qDrawWinPanel(p, x, y + c - 2, w, 4, palette(), TRUE);
qDrawWinPanel(p, x, y + c - 2, w, 4, palette(), true);
p->setPen(palette().color(QPalette::Shadow));
p->drawLine(x+1, y + c - 1, x + w - 3, y + c - 1);
}
......
......@@ -1455,7 +1455,7 @@ QvisSpectrumBar::drawArrow(QPainter &p, bool down, int x, int y, int w, int h,
p.setPen(pen);
p.setBrush(brush);
p.setWorldMatrix(matrix, TRUE); // set transformation matrix
p.setWorldMatrix(matrix, true); // set transformation matrix
p.drawPolygon(bFill); // fill arrow
p.setBrush(Qt::NoBrush); // don't fill
......
......@@ -86,7 +86,7 @@ VisItSimStripChart::VisItSimStripChart(QWidget *parent, int winX, int winY )
pal.setColor(QPalette::Background, Qt::white);
setPalette(pal);
down = FALSE;
down = false;
delta = 0;
vdelta = 0;
winXSize = winX;
......@@ -96,7 +96,7 @@ VisItSimStripChart::VisItSimStripChart(QWidget *parent, int winX, int winY )
minData = std::numeric_limits<double>::max();
maxData = -std::numeric_limits<double>::max();
resize(winX,winY);
enableLogScale = FALSE;
enableLogScale = false;
// set the timeshift offset to start at the right side of the
// window.
......@@ -107,7 +107,7 @@ VisItSimStripChart::VisItSimStripChart(QWidget *parent, int winX, int winY )
outOfBandLimitsEnabled = 0;
// Used to scale up and down the y axis in the strip chart
zoom =1.0;
center = FALSE;
center = false;
// controls maximum amount you can zoom out.
zoomOutLimit = 0.001;
pointSize = 14;
......@@ -175,7 +175,7 @@ void VisItSimStripChart::paintEvent( QPaintEvent * )
if ( center )
{
paint.translate( 0,points.back().y());
center = FALSE;
center = false;
}
// start drawing the data n times step away from the right
// hand edge of the window.
......@@ -332,7 +332,7 @@ void VisItSimStripChart::paintGrid(QPainter *paint)
void VisItSimStripChart::mousePressEvent( QMouseEvent * )
{
down = TRUE;
down = true;
// erase widget contents
//erase();
}
......@@ -364,7 +364,7 @@ void VisItSimStripChart::mousePressEvent( QMouseEvent * )
bool VisItSimStripChart::addDataPoint( double x, double y )
{
float additionalMargin;
bool outOfBounds = FALSE;
bool outOfBounds = false;
currentData = y;
currentCycle = x;
// special startup processing
......@@ -399,7 +399,7 @@ bool VisItSimStripChart::addDataPoint( double x, double y )
if ( outOfBandLimitsEnabled )
{
if (data.y() > maxYLimit || data.y() < minYLimit )
outOfBounds = TRUE;
outOfBounds = true;
}
return outOfBounds;
}
......@@ -771,7 +771,7 @@ void VisItSimStripChart::reset()
currentCycle = 0;
currentScaledY=0;
//enableLogScale = FALSE;
//enableLogScale = false;
// set the timeshift offset to start at the right side of the
// window.
......@@ -784,7 +784,7 @@ void VisItSimStripChart::reset()
outOfBandLimitsEnabled = 0;
// Used to scale up and down the y axis in the strip chart
zoom =1.0;
center = FALSE;
center = false;
// controls maximum amount you can zoom out.
zoomOutLimit = 0.001;
pointSize = 14;
......
......@@ -89,8 +89,8 @@ QvisStripChartMgr::QvisStripChartMgr(QWidget *parent, ViewerProxy *theViewer,
engines = engineList;
addLayoutStretch = false;
CreateEntireWindow();
isPosted = FALSE;
postEnabled = TRUE;
isPosted = false;
postEnabled = true;
}
// ****************************************************************************
......
......@@ -496,7 +496,7 @@ QvisStripChartTabWidget::getEnableLogScale()
bool
QvisStripChartTabWidget::addDataPoint(const QString &name, double x, double y)
{
bool outOfBounds = TRUE;
bool outOfBounds = true;
int ST_Index = nameToIndex(name);
if (ST_Index >= 0 )
outOfBounds = stripCharts[ST_Index]->addDataPoint(x,y);
......
......@@ -464,7 +464,7 @@ QvisColorButton::popupPressed()
// Show the popup menu.
popup->move(menuX, menuY);
popup->show();
setDown(FALSE);
setDown(false);
}
}
......
......@@ -454,7 +454,7 @@ void
QvisOpacitySlider::drawSliderGroove(QPainter *p, int x, int y, int w, int,
int c)
{
qDrawWinPanel(p, x, y + c - 2, w, 4, palette(), TRUE);
qDrawWinPanel(p, x, y + c - 2, w, 4, palette(), true);
p->setPen(palette().color(QPalette::Shadow));
p->drawLine(x+1, y + c - 1, x + w - 3, y + c - 1);
}
......
......@@ -238,7 +238,7 @@ SetAppearance(QApplication *app, AppearanceAttributes *aa)
if(v >= 255 - 50)
{
base = btn.dark(150);
bright_mode = TRUE;
bright_mode = true;
}
QPalette pal(fg, btn, btn.light(),
......
......@@ -367,7 +367,7 @@ QvisColorTableButton::popupPressed()
// Show the popup menu.
colorTableMenu->exec(QPoint(menuX, menuY));
setDown(FALSE);
setDown(false);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment