Some coding style cleanup.

This commit is contained in:
Jim Evins
2017-01-14 01:04:35 -05:00
parent f6de611a68
commit da3436a02a
5 changed files with 62 additions and 45 deletions
+6 -6
View File
@@ -78,9 +78,9 @@ ColorNode::ColorNode( const QString& key )
///
bool ColorNode::operator==( const ColorNode& cn )
{
return ( (mIsField == cn.mIsField) &&
(mColor == cn.mColor) &&
(mKey == cn.mKey) );
return (mIsField == cn.mIsField) &&
(mColor == cn.mColor) &&
(mKey == cn.mKey);
}
@@ -89,9 +89,9 @@ bool ColorNode::operator==( const ColorNode& cn )
///
bool ColorNode::operator!=( const ColorNode& cn )
{
return ( (mIsField != cn.mIsField) ||
(mColor != cn.mColor) ||
(mKey != cn.mKey) );
return (mIsField != cn.mIsField) ||
(mColor != cn.mColor) ||
(mKey != cn.mKey);
}
+2 -2
View File
@@ -262,7 +262,7 @@ LabelEditor::zoomToFit()
bool
LabelEditor::isZoomMax() const
{
return ( mZoom >= zoomLevels[0] );
return mZoom >= zoomLevels[0];
}
@@ -272,7 +272,7 @@ LabelEditor::isZoomMax() const
bool
LabelEditor::isZoomMin() const
{
return ( mZoom <= zoomLevels[nZoomLevels-1] );
return mZoom <= zoomLevels[nZoomLevels-1];
}
+1 -1
View File
@@ -558,7 +558,7 @@ bool LabelModel::isSelectionAtomic()
}
}
return (nSelected == 1);
return nSelected == 1;
}
+6 -6
View File
@@ -44,8 +44,8 @@ TextNode::TextNode( bool isField, const QString &data )
///
bool TextNode::operator==( const TextNode& other )
{
return ( (mIsField == other.mIsField) &&
(mData == other.mData) );
return (mIsField == other.mIsField) &&
(mData == other.mData);
}
@@ -54,8 +54,8 @@ bool TextNode::operator==( const TextNode& other )
///
bool TextNode::operator!=( const TextNode& other )
{
return ( (mIsField != other.mIsField) ||
(mData != other.mData) );
return (mIsField != other.mIsField) ||
(mData != other.mData);
}
@@ -93,7 +93,7 @@ void TextNode::setData( const QString& data )
{
mData = data;
}
///
/// Get text, expand if necessary
@@ -134,7 +134,7 @@ bool TextNode::isEmptyField( merge::Record* record ) const
{
if ( record->contains( mData ) )
{
return ( (*record)[mData].isEmpty() );
return (*record)[mData].isEmpty();
}
}