Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Pointer cleanup (#242)

Browse Source 
- Made greater use of smart pointers, eliminating many instances of manual memory management
- Do not use pointers at all for many non-polymorphic classes
- Assorted other code cleanup
This commit is contained in:
Jaye Evins
2025-10-31 16:11:28 -04:00
committed by GitHub
parent fd10d88be5
commit 8c8e447336
159 changed files with 3364 additions and 4045 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/unit_tests/TestColorNode.cpp
+21 -24
View File
@@ -18,6 +18,7 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "TestColorNode.h"
#include "model/ColorNode.h"
@@ -53,10 +54,8 @@ void TestColorNode::colorNode()
QCOMPARE( colorNode.color(), blackTransparent );
QCOMPARE( colorNode.key(), QString( "" ) );
QCOMPARE( colorNode.rgba(), rgbaBlackTransparent );
QCOMPARE( colorNode.color( nullptr, nullptr ), blackTransparent );
QCOMPARE( colorNode.color( &record, nullptr ), blackTransparent );
QCOMPARE( colorNode.color( nullptr, &vars ), blackTransparent );
QCOMPARE( colorNode.color( &record, &vars ), blackTransparent );
QCOMPARE( colorNode.color( NullRecord(), vars ), blackTransparent );
QCOMPARE( colorNode.color( record, vars ), blackTransparent );
colorNode.setField( true );
QVERIFY( colorNode.isField() );
@@ -66,10 +65,8 @@ void TestColorNode::colorNode()
colorNode.setColor( white );
QCOMPARE( colorNode.color(), white );
QCOMPARE( colorNode.rgba(), rgbaWhite );
QCOMPARE( colorNode.color( nullptr, nullptr ), white );
QCOMPARE( colorNode.color( &record, nullptr ), white );
QCOMPARE( colorNode.color( nullptr, &vars ), white );
QCOMPARE( colorNode.color( &record, &vars ), white );
QCOMPARE( colorNode.color( NullRecord(), vars ), white );
QCOMPARE( colorNode.color( record, vars ), white );
colorNode.setKey( "key1" );
QCOMPARE( colorNode.key(), QString( "key1" ) );
@@ -109,27 +106,27 @@ void TestColorNode::colorNode()
QVERIFY( colorNode.isField() ); // Defaults to true if given key only
QCOMPARE( colorNode.key(), QString( "key1" ) );
QCOMPARE( colorNode.color(), blackTransparent );
QCOMPARE( colorNode.color( &record, &vars ), silver80 ); // Defaults to silver if given non-matching record/variables
QCOMPARE( colorNode.color( record, vars ), silver80 ); // Defaults to silver if given non-matching record/variables
record["key1"] = "white";
QCOMPARE( colorNode.color( &record, nullptr ), white );
QCOMPARE( colorNode.color( record, vars ), white );
record["key1"] = "red";
QCOMPARE( colorNode.color( &record, nullptr ), red );
QCOMPARE( colorNode.color( record, vars ), red );
record["key1"] = "#FF0000";
QCOMPARE( colorNode.color( &record, nullptr ), red );
QCOMPARE( colorNode.color( record, vars ), red );
record["key1"] = "#FFFF0000"; // ARGB
QCOMPARE( colorNode.color( &record, nullptr ), red );
QCOMPARE( colorNode.color( record, vars ), red );
record["key1"] = "#8000FF00";
QCOMPARE( colorNode.color( &record, nullptr ), green80 );
QCOMPARE( colorNode.color( record, vars ), green80 );
colorNode.setKey( "key2" );
QCOMPARE( colorNode.color( &record, nullptr ), silver80 );
QCOMPARE( colorNode.color( record, vars ), silver80 );
record["key2"] = "#8000FF00";
QCOMPARE( colorNode.color( &record, nullptr ), green80 );
QCOMPARE( colorNode.color( record, vars ), green80 );
///
/// Variable
@@ -138,40 +135,40 @@ void TestColorNode::colorNode()
QVERIFY( colorNode.isField() ); // Defaults to true if given key only
QCOMPARE( colorNode.key(), QString( "c1" ) );
QCOMPARE( colorNode.color(), blackTransparent );
QCOMPARE( colorNode.color( &record, &vars ), silver80 ); // Defaults to silver if given non-matching record/variables
QCOMPARE( colorNode.color( record, vars ), silver80 ); // Defaults to silver if given non-matching record/variables
{
Variable c1( Variable::Type::COLOR, "c1", "white", Variable::Increment::PER_ITEM );
vars.addVariable( c1 );
}
QCOMPARE( colorNode.color( nullptr, &vars ), white );
QCOMPARE( colorNode.color( NullRecord(), vars ), white );
vars.incrementVariablesOnItem();
QCOMPARE( colorNode.color( nullptr, &vars ), white );
QCOMPARE( colorNode.color( NullRecord(), vars ), white );
{
Variable c1( Variable::Type::COLOR, "c1", "red", Variable::Increment::PER_ITEM );
vars.addVariable( c1 );
}
QCOMPARE( colorNode.color( nullptr, &vars ), red );
QCOMPARE( colorNode.color( NullRecord(), vars ), red );
{
Variable c1( Variable::Type::COLOR, "c1", "#8000FF00", Variable::Increment::PER_ITEM );
vars.addVariable( c1 );
}
QCOMPARE( colorNode.color( nullptr, &vars ), green80 );
QCOMPARE( colorNode.color( NullRecord(), vars ), green80 );
colorNode.setKey( "c2" );
QCOMPARE( colorNode.color( &record, nullptr ), silver80 );
QCOMPARE( colorNode.color( record, vars ), silver80 );
{
Variable c2( Variable::Type::COLOR, "c2", "#8000FF00", Variable::Increment::PER_ITEM );
vars.addVariable( c2 );
}
QCOMPARE( colorNode.color( nullptr, &vars ), green80 );
QCOMPARE( colorNode.color( NullRecord(), vars ), green80 );
///
/// Record beats variable
///
record["c2"] = "red";
QCOMPARE( colorNode.color( &record, &vars ), red );
QCOMPARE( colorNode.color( record, vars ), red );
}