diff --git a/src/canalconfigwizard.cpp b/src/canalconfigwizard.cpp index a3ef06e5..48ccfd7e 100644 --- a/src/canalconfigwizard.cpp +++ b/src/canalconfigwizard.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/canalconfigwizard.h b/src/canalconfigwizard.h index 0c25dc94..c8edb573 100644 --- a/src/canalconfigwizard.h +++ b/src/canalconfigwizard.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgactionparam.cpp b/src/cdlgactionparam.cpp index 34b7df33..e4f43b8d 100644 --- a/src/cdlgactionparam.cpp +++ b/src/cdlgactionparam.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgactionparam.h b/src/cdlgactionparam.h index e5fabac7..2e464644 100644 --- a/src/cdlgactionparam.h +++ b/src/cdlgactionparam.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgcanfilter.cpp b/src/cdlgcanfilter.cpp index 623b4913..20e890ee 100644 --- a/src/cdlgcanfilter.cpp +++ b/src/cdlgcanfilter.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgcanfilter.h b/src/cdlgcanfilter.h index dfbfc3c0..fd6e17ae 100644 --- a/src/cdlgcanfilter.h +++ b/src/cdlgcanfilter.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingscanal.cpp b/src/cdlgconnsettingscanal.cpp index e8cf4058..d0400131 100644 --- a/src/cdlgconnsettingscanal.cpp +++ b/src/cdlgconnsettingscanal.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingscanal.h b/src/cdlgconnsettingscanal.h index dfb69c92..dd110e0a 100644 --- a/src/cdlgconnsettingscanal.h +++ b/src/cdlgconnsettingscanal.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingslocal.cpp b/src/cdlgconnsettingslocal.cpp index 9dff07f7..34ba597c 100644 --- a/src/cdlgconnsettingslocal.cpp +++ b/src/cdlgconnsettingslocal.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingslocal.h b/src/cdlgconnsettingslocal.h index 9b8eae4b..2f29e821 100644 --- a/src/cdlgconnsettingslocal.h +++ b/src/cdlgconnsettingslocal.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsmqtt.cpp b/src/cdlgconnsettingsmqtt.cpp index 7ae31162..731ad62c 100644 --- a/src/cdlgconnsettingsmqtt.cpp +++ b/src/cdlgconnsettingsmqtt.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsmqtt.h b/src/cdlgconnsettingsmqtt.h index a0faf29a..4796db15 100644 --- a/src/cdlgconnsettingsmqtt.h +++ b/src/cdlgconnsettingsmqtt.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsmulticast.cpp b/src/cdlgconnsettingsmulticast.cpp index f95999d6..08182c23 100644 --- a/src/cdlgconnsettingsmulticast.cpp +++ b/src/cdlgconnsettingsmulticast.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsmulticast.h b/src/cdlgconnsettingsmulticast.h index 91f97b28..2098f2db 100644 --- a/src/cdlgconnsettingsmulticast.h +++ b/src/cdlgconnsettingsmulticast.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsrawcan.cpp b/src/cdlgconnsettingsrawcan.cpp index 2e17040b..2f35bb14 100644 --- a/src/cdlgconnsettingsrawcan.cpp +++ b/src/cdlgconnsettingsrawcan.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsrawcan.h b/src/cdlgconnsettingsrawcan.h index e7f51615..f6defbb0 100644 --- a/src/cdlgconnsettingsrawcan.h +++ b/src/cdlgconnsettingsrawcan.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsrawmqtt.cpp b/src/cdlgconnsettingsrawmqtt.cpp index 121f83e7..23068f4b 100644 --- a/src/cdlgconnsettingsrawmqtt.cpp +++ b/src/cdlgconnsettingsrawmqtt.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsrawmqtt.h b/src/cdlgconnsettingsrawmqtt.h index 1c65b68d..173c916a 100644 --- a/src/cdlgconnsettingsrawmqtt.h +++ b/src/cdlgconnsettingsrawmqtt.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsrest.cpp b/src/cdlgconnsettingsrest.cpp index eee993fe..e9fb49bc 100644 --- a/src/cdlgconnsettingsrest.cpp +++ b/src/cdlgconnsettingsrest.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsrest.h b/src/cdlgconnsettingsrest.h index bf31fa3e..5a4d5583 100644 --- a/src/cdlgconnsettingsrest.h +++ b/src/cdlgconnsettingsrest.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingssocketcan.cpp b/src/cdlgconnsettingssocketcan.cpp index 7b0f5ff7..1b03ea2c 100644 --- a/src/cdlgconnsettingssocketcan.cpp +++ b/src/cdlgconnsettingssocketcan.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingssocketcan.h b/src/cdlgconnsettingssocketcan.h index 8b344ba1..e5438c0b 100644 --- a/src/cdlgconnsettingssocketcan.h +++ b/src/cdlgconnsettingssocketcan.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingstcpip.cpp b/src/cdlgconnsettingstcpip.cpp index fbb0d2d2..d25cbc73 100644 --- a/src/cdlgconnsettingstcpip.cpp +++ b/src/cdlgconnsettingstcpip.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingstcpip.h b/src/cdlgconnsettingstcpip.h index 55454c52..b74338ae 100644 --- a/src/cdlgconnsettingstcpip.h +++ b/src/cdlgconnsettingstcpip.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsudp.cpp b/src/cdlgconnsettingsudp.cpp index a7867447..2719adb7 100644 --- a/src/cdlgconnsettingsudp.cpp +++ b/src/cdlgconnsettingsudp.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsudp.h b/src/cdlgconnsettingsudp.h index 945dd0b6..7f3143c9 100644 --- a/src/cdlgconnsettingsudp.h +++ b/src/cdlgconnsettingsudp.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsws1.cpp b/src/cdlgconnsettingsws1.cpp index b28ca5f9..5f357a3c 100644 --- a/src/cdlgconnsettingsws1.cpp +++ b/src/cdlgconnsettingsws1.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsws1.h b/src/cdlgconnsettingsws1.h index 4eecc01a..55c37376 100644 --- a/src/cdlgconnsettingsws1.h +++ b/src/cdlgconnsettingsws1.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsws2.cpp b/src/cdlgconnsettingsws2.cpp index 3d5fd296..88fc9c2d 100644 --- a/src/cdlgconnsettingsws2.cpp +++ b/src/cdlgconnsettingsws2.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgconnsettingsws2.h b/src/cdlgconnsettingsws2.h index 7dfcbb5d..e656ab60 100644 --- a/src/cdlgconnsettingsws2.h +++ b/src/cdlgconnsettingsws2.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgdatepicker.cpp b/src/cdlgdatepicker.cpp index b85cce53..27cf0bfe 100644 --- a/src/cdlgdatepicker.cpp +++ b/src/cdlgdatepicker.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgdatepicker.h b/src/cdlgdatepicker.h index 5f3c59a0..2e4bc167 100644 --- a/src/cdlgdatepicker.h +++ b/src/cdlgdatepicker.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditdm.cpp b/src/cdlgeditdm.cpp index 4851fe9d..a52bc645 100644 --- a/src/cdlgeditdm.cpp +++ b/src/cdlgeditdm.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditdm.h b/src/cdlgeditdm.h index abc14042..95349e3e 100644 --- a/src/cdlgeditdm.h +++ b/src/cdlgeditdm.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditguid.cpp b/src/cdlgeditguid.cpp index 337d76b5..443f4c90 100644 --- a/src/cdlgeditguid.cpp +++ b/src/cdlgeditguid.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditguid.h b/src/cdlgeditguid.h index 04df3eb3..ea05a4bc 100644 --- a/src/cdlgeditguid.h +++ b/src/cdlgeditguid.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditmap.cpp b/src/cdlgeditmap.cpp index aaf618dd..528a952b 100644 --- a/src/cdlgeditmap.cpp +++ b/src/cdlgeditmap.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditmap.h b/src/cdlgeditmap.h index 408f31e9..98bd1afc 100644 --- a/src/cdlgeditmap.h +++ b/src/cdlgeditmap.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditsensorindex.cpp b/src/cdlgeditsensorindex.cpp index 3142c49e..f6f09ee5 100644 --- a/src/cdlgeditsensorindex.cpp +++ b/src/cdlgeditsensorindex.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditsensorindex.h b/src/cdlgeditsensorindex.h index a688bad4..b66fc58f 100644 --- a/src/cdlgeditsensorindex.h +++ b/src/cdlgeditsensorindex.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditsessionfilter.cpp b/src/cdlgeditsessionfilter.cpp index 01de2e14..80ebcb6c 100644 --- a/src/cdlgeditsessionfilter.cpp +++ b/src/cdlgeditsessionfilter.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgeditsessionfilter.h b/src/cdlgeditsessionfilter.h index e428923a..10680f2b 100644 --- a/src/cdlgeditsessionfilter.h +++ b/src/cdlgeditsessionfilter.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgknownguid.cpp b/src/cdlgknownguid.cpp index 2db285c5..116257c4 100644 --- a/src/cdlgknownguid.cpp +++ b/src/cdlgknownguid.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgknownguid.h b/src/cdlgknownguid.h index 000abd79..aa0f3fdc 100644 --- a/src/cdlgknownguid.h +++ b/src/cdlgknownguid.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlglevel1filter.cpp b/src/cdlglevel1filter.cpp index 00605b90..e11ce8e0 100644 --- a/src/cdlglevel1filter.cpp +++ b/src/cdlglevel1filter.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlglevel1filter.h b/src/cdlglevel1filter.h index f16b28cc..29efbfe8 100644 --- a/src/cdlglevel1filter.h +++ b/src/cdlglevel1filter.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlglevel1filterwizard.cpp b/src/cdlglevel1filterwizard.cpp index 11416055..a1f6f648 100644 --- a/src/cdlglevel1filterwizard.cpp +++ b/src/cdlglevel1filterwizard.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlglevel1filterwizard.h b/src/cdlglevel1filterwizard.h index b07952a8..9d22e49b 100644 --- a/src/cdlglevel1filterwizard.h +++ b/src/cdlglevel1filterwizard.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlglevel2filter.cpp b/src/cdlglevel2filter.cpp index 0ece37e2..464c1e15 100644 --- a/src/cdlglevel2filter.cpp +++ b/src/cdlglevel2filter.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlglevel2filter.h b/src/cdlglevel2filter.h index 73bd547d..6ca52768 100644 --- a/src/cdlglevel2filter.h +++ b/src/cdlglevel2filter.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmainsettings.cpp b/src/cdlgmainsettings.cpp index 2868ea32..b0465884 100644 --- a/src/cdlgmainsettings.cpp +++ b/src/cdlgmainsettings.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmainsettings.h b/src/cdlgmainsettings.h index 42329f97..ccf49489 100644 --- a/src/cdlgmainsettings.h +++ b/src/cdlgmainsettings.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfbootloader.cpp b/src/cdlgmdfbootloader.cpp index f9f27e76..c59ea570 100644 --- a/src/cdlgmdfbootloader.cpp +++ b/src/cdlgmdfbootloader.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfbootloader.h b/src/cdlgmdfbootloader.h index 5aeea9ec..e7b10299 100644 --- a/src/cdlgmdfbootloader.h +++ b/src/cdlgmdfbootloader.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfcontact.cpp b/src/cdlgmdfcontact.cpp index b8f68d4c..8944316e 100644 --- a/src/cdlgmdfcontact.cpp +++ b/src/cdlgmdfcontact.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfcontact.h b/src/cdlgmdfcontact.h index 0ac82ca6..c2d431da 100644 --- a/src/cdlgmdfcontact.h +++ b/src/cdlgmdfcontact.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfcontactlist.cpp b/src/cdlgmdfcontactlist.cpp index e830a655..1fa8eae3 100644 --- a/src/cdlgmdfcontactlist.cpp +++ b/src/cdlgmdfcontactlist.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfcontactlist.h b/src/cdlgmdfcontactlist.h index 72052154..164a93e4 100644 --- a/src/cdlgmdfcontactlist.h +++ b/src/cdlgmdfcontactlist.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfdescription.cpp b/src/cdlgmdfdescription.cpp index 9903880a..9d9a39fb 100644 --- a/src/cdlgmdfdescription.cpp +++ b/src/cdlgmdfdescription.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfdescription.h b/src/cdlgmdfdescription.h index f361408a..7b893bf2 100644 --- a/src/cdlgmdfdescription.h +++ b/src/cdlgmdfdescription.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffile.cpp b/src/cdlgmdffile.cpp index 1e43dde9..0b211bf9 100644 --- a/src/cdlgmdffile.cpp +++ b/src/cdlgmdffile.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffile.h b/src/cdlgmdffile.h index 774bf6cb..c7cb2466 100644 --- a/src/cdlgmdffile.h +++ b/src/cdlgmdffile.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffiledriver.cpp b/src/cdlgmdffiledriver.cpp index 3ff00c52..48c5ce3d 100644 --- a/src/cdlgmdffiledriver.cpp +++ b/src/cdlgmdffiledriver.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffiledriver.h b/src/cdlgmdffiledriver.h index 0d4e84b2..ca13069d 100644 --- a/src/cdlgmdffiledriver.h +++ b/src/cdlgmdffiledriver.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilefirmware.cpp b/src/cdlgmdffilefirmware.cpp index 56b209d7..2978eeca 100644 --- a/src/cdlgmdffilefirmware.cpp +++ b/src/cdlgmdffilefirmware.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilefirmware.h b/src/cdlgmdffilefirmware.h index 5d7e58e6..9c344c6a 100644 --- a/src/cdlgmdffilefirmware.h +++ b/src/cdlgmdffilefirmware.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilemanual.cpp b/src/cdlgmdffilemanual.cpp index b72acd0b..45be6f6a 100644 --- a/src/cdlgmdffilemanual.cpp +++ b/src/cdlgmdffilemanual.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilemanual.h b/src/cdlgmdffilemanual.h index f30080a1..16c5baad 100644 --- a/src/cdlgmdffilemanual.h +++ b/src/cdlgmdffilemanual.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilepicture.cpp b/src/cdlgmdffilepicture.cpp index cb57d094..5e6b013c 100644 --- a/src/cdlgmdffilepicture.cpp +++ b/src/cdlgmdffilepicture.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilepicture.h b/src/cdlgmdffilepicture.h index 18c63f18..e92fe665 100644 --- a/src/cdlgmdffilepicture.h +++ b/src/cdlgmdffilepicture.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilesetup.cpp b/src/cdlgmdffilesetup.cpp index 30272009..ef7dc886 100644 --- a/src/cdlgmdffilesetup.cpp +++ b/src/cdlgmdffilesetup.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilesetup.h b/src/cdlgmdffilesetup.h index c931a416..6af5bd7a 100644 --- a/src/cdlgmdffilesetup.h +++ b/src/cdlgmdffilesetup.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilevideo.cpp b/src/cdlgmdffilevideo.cpp index 431d2298..c999951a 100644 --- a/src/cdlgmdffilevideo.cpp +++ b/src/cdlgmdffilevideo.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdffilevideo.h b/src/cdlgmdffilevideo.h index 3e9e50f3..6f34d927 100644 --- a/src/cdlgmdffilevideo.h +++ b/src/cdlgmdffilevideo.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfinfourl.cpp b/src/cdlgmdfinfourl.cpp index 9e429131..efe73fbb 100644 --- a/src/cdlgmdfinfourl.cpp +++ b/src/cdlgmdfinfourl.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfinfourl.h b/src/cdlgmdfinfourl.h index c25c2f33..2b48609a 100644 --- a/src/cdlgmdfinfourl.h +++ b/src/cdlgmdfinfourl.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfmanufacturer.cpp b/src/cdlgmdfmanufacturer.cpp index 79ca9f69..f46b4744 100644 --- a/src/cdlgmdfmanufacturer.cpp +++ b/src/cdlgmdfmanufacturer.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfmanufacturer.h b/src/cdlgmdfmanufacturer.h index 8905a879..5c102e7c 100644 --- a/src/cdlgmdfmanufacturer.h +++ b/src/cdlgmdfmanufacturer.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfmodule.cpp b/src/cdlgmdfmodule.cpp index 8476823b..2d33e4a2 100644 --- a/src/cdlgmdfmodule.cpp +++ b/src/cdlgmdfmodule.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfmodule.h b/src/cdlgmdfmodule.h index 8bff6116..05a88cc4 100644 --- a/src/cdlgmdfmodule.h +++ b/src/cdlgmdfmodule.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregister.cpp b/src/cdlgmdfregister.cpp index 28140dc7..feb2ce5a 100644 --- a/src/cdlgmdfregister.cpp +++ b/src/cdlgmdfregister.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregister.h b/src/cdlgmdfregister.h index c6e0e12a..5e0a707b 100644 --- a/src/cdlgmdfregister.h +++ b/src/cdlgmdfregister.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregisterbit.cpp b/src/cdlgmdfregisterbit.cpp index 7695bd0a..dcbb622b 100644 --- a/src/cdlgmdfregisterbit.cpp +++ b/src/cdlgmdfregisterbit.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregisterbit.h b/src/cdlgmdfregisterbit.h index 5d11de43..06d4260c 100644 --- a/src/cdlgmdfregisterbit.h +++ b/src/cdlgmdfregisterbit.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregisterbitlist.cpp b/src/cdlgmdfregisterbitlist.cpp index 69dda565..87c3e8ad 100644 --- a/src/cdlgmdfregisterbitlist.cpp +++ b/src/cdlgmdfregisterbitlist.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregisterbitlist.h b/src/cdlgmdfregisterbitlist.h index 902f3bb6..78561e93 100644 --- a/src/cdlgmdfregisterbitlist.h +++ b/src/cdlgmdfregisterbitlist.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregisterlist.cpp b/src/cdlgmdfregisterlist.cpp index 419e24bc..997de4a2 100644 --- a/src/cdlgmdfregisterlist.cpp +++ b/src/cdlgmdfregisterlist.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregisterlist.h b/src/cdlgmdfregisterlist.h index 9b4b0af8..c2f6572d 100644 --- a/src/cdlgmdfregisterlist.h +++ b/src/cdlgmdfregisterlist.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregistervalue.cpp b/src/cdlgmdfregistervalue.cpp index 257d6286..205aa746 100644 --- a/src/cdlgmdfregistervalue.cpp +++ b/src/cdlgmdfregistervalue.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregistervalue.h b/src/cdlgmdfregistervalue.h index 6a7c7b02..3c1ee40d 100644 --- a/src/cdlgmdfregistervalue.h +++ b/src/cdlgmdfregistervalue.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregistervaluelist.cpp b/src/cdlgmdfregistervaluelist.cpp index 3848dcd1..0b129531 100644 --- a/src/cdlgmdfregistervaluelist.cpp +++ b/src/cdlgmdfregistervaluelist.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfregistervaluelist.h b/src/cdlgmdfregistervaluelist.h index 14accd7f..41c8934e 100644 --- a/src/cdlgmdfregistervaluelist.h +++ b/src/cdlgmdfregistervaluelist.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmdfremotevar.cpp b/src/cdlgmdfremotevar.cpp index eb8f9d26..ebe5ec6f 100644 --- a/src/cdlgmdfremotevar.cpp +++ b/src/cdlgmdfremotevar.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -89,14 +89,14 @@ CDlgMdfRemoteVar::initDialogData(CMDF* pmdf, CMDF_RemoteVariable* pvar, int inde QString str; if (nullptr == pmdf) { - spdlog::error("MDF register information - Invalid MDF object (initDialogData)"); + spdlog::error("MDF remote variable information - Invalid MDF object (initDialogData)"); return; } m_pmdf = pmdf; if (nullptr == pvar) { - spdlog::error("MDF register information - Invalid MDF register object (initDialogData)"); + spdlog::error("MDF remote variable information - Invalid MDF remote variable object (initDialogData)"); return; } @@ -118,28 +118,26 @@ CDlgMdfRemoteVar::initDialogData(CMDF* pmdf, CMDF_RemoteVariable* pvar, int inde connect(ui->btnSetUndef, SIGNAL(clicked()), this, - SLOT(setUndef())); + SLOT(setUndef())); setName(pvar->getName().c_str()); setPage(pvar->getPage()); setOffset(pvar->getOffset()); + setBitOffset(pvar->getBitPos()); setType(pvar->getType()); - // setSpan(pvar->getSpan()); - // setMin(pvar->getMin()); - // setMax(pvar->getMax()); + setSpan(pvar->getTypeByteCount()); setAccess(pvar->getAccess()); - uint8_t val; - // bool bDefault = pvar->getDefault(val); - // str = pvar->getDefault(val) ? QString("%1").arg(val) : "UNDEF"; + str = pvar->getDefault().c_str(); setDefault(str); setForegroundColor(pvar->getForegroundColor()); setBackgroundColor(pvar->getBackgroundColor()); + // Fill page combo box with used pages std::set pages; uint32_t cnt = pmdf->getPages(pages); ui->comboPage->clear(); int pos = 0; - for (std::set::iterator it=pages.begin(); it!=pages.end(); ++it) { + for (std::set::iterator it = pages.begin(); it != pages.end(); ++it) { ui->comboPage->addItem(QString("Page %1").arg(*it), *it); if (pvar->getPage() == *it) { ui->comboPage->setCurrentIndex(pos); @@ -147,39 +145,30 @@ CDlgMdfRemoteVar::initDialogData(CMDF* pmdf, CMDF_RemoteVariable* pvar, int inde pos++; } - switch (index) { case index_name: ui->editName->setFocus(); break; - case index_page: - ui->comboPage->setFocus(); - break; - - // case index_offset: - // ui->editOffset->setFocus(); - // break; - case index_type: ui->comboType->setFocus(); break; - // case index_span: - // ui->spinSpan->setFocus(); - // break; + case index_span: + ui->spinSpan->setFocus(); + break; - // case index_width: - // ui->spinWidth->setFocus(); - // break; + case index_page: + ui->comboPage->setFocus(); + break; - // case index_min: - // ui->spinMin->setFocus(); - // break; + case index_offset: + ui->spinOffset->setFocus(); + break; - // case index_max: - // ui->spinMax->setFocus(); - // break; + case index_bit_offset: + ui->spinBitOffset->setFocus(); + break; case index_access: ui->comboAccess->setFocus(); @@ -195,7 +184,7 @@ CDlgMdfRemoteVar::initDialogData(CMDF* pmdf, CMDF_RemoteVariable* pvar, int inde case index_bgcolor: ui->editBgColor->setFocus(); - break; + break; default: ui->editName->setFocus(); @@ -321,33 +310,45 @@ CDlgMdfRemoteVar::setOffset(uint32_t offset) // ----------------------------------------------------------------------- -uint8_t +uint32_t +CDlgMdfRemoteVar::getBitOffset(void) +{ + return ui->spinBitOffset->value(); +} + +void +CDlgMdfRemoteVar::setBitOffset(uint32_t offset) +{ + ui->spinBitOffset->setValue(offset); +} + +// ----------------------------------------------------------------------- + +vscp_remote_variable_type CDlgMdfRemoteVar::getType(void) { - return ui->comboPage->currentIndex(); + return static_cast(ui->comboType->currentIndex()); } void -CDlgMdfRemoteVar::setType(uint8_t type) +CDlgMdfRemoteVar::setType(vscp_remote_variable_type type) { - if (type <= MDF_REG_TYPE_BLOCK) { - ui->comboPage->setCurrentIndex(type); - } + ui->comboType->setCurrentIndex(static_cast(type)); } // ----------------------------------------------------------------------- -// uint16_t -// CDlgMdfRemoteVar::getSpan(void) -// { -// return ui->spinSpan->value(); -// } +uint16_t +CDlgMdfRemoteVar::getSpan(void) +{ + return ui->spinSpan->value(); +} -// void -// CDlgMdfRemoteVar::setSpan(uint16_t span) -// { -// ui->spinSpan->setValue(span); -// } +void +CDlgMdfRemoteVar::setSpan(uint16_t span) +{ + ui->spinSpan->setValue(span); +} // ----------------------------------------------------------------------- @@ -365,34 +366,6 @@ CDlgMdfRemoteVar::setType(uint8_t type) // ----------------------------------------------------------------------- -// uint8_t -// CDlgMdfRemoteVar::getMin(void) -// { -// return ui->spinMin->value(); -// } - -// void -// CDlgMdfRemoteVar::setMin(uint8_t min) -// { -// ui->spinMin->setValue(min); -// } - -// ----------------------------------------------------------------------- - -// uint8_t -// CDlgMdfRemoteVar::getMax(void) -// { -// return ui->spinMax->value(); -// } - -// void -// CDlgMdfRemoteVar::setMax(uint8_t span) -// { -// ui->spinMax->setValue(span); -// } - -// ----------------------------------------------------------------------- - mdf_access_mode CDlgMdfRemoteVar::getAccess(void) { @@ -400,11 +373,9 @@ CDlgMdfRemoteVar::getAccess(void) } void -CDlgMdfRemoteVar::setAccess(uint8_t access) +CDlgMdfRemoteVar::setAccess(mdf_access_mode access) { - if (access <= MDF_REG_ACCESS_READ_WRITE) { - ui->comboAccess->setCurrentIndex(access); - } + ui->comboAccess->setCurrentIndex(static_cast(access)); } // ----------------------------------------------------------------------- @@ -461,9 +432,9 @@ CDlgMdfRemoteVar::accept() m_pvar->setPage(getPage()); m_pvar->setOffset(getOffset()); m_pvar->setType(static_cast(getType())); - //m_pvar->setSpan(getSpan()); - //m_pvar->setMin(getMin()); - //m_pvar->setMax(getMax()); + // m_pvar->setSpan(getSpan()); + // m_pvar->setMin(getMin()); + // m_pvar->setMax(getMax()); m_pvar->setAccess(getAccess()); m_pvar->setDefault(getDefault().toStdString()); m_pvar->setForegroundColor(getForegroundColor()); diff --git a/src/cdlgmdfremotevar.h b/src/cdlgmdfremotevar.h index 1e9a9cbd..cfcd349b 100644 --- a/src/cdlgmdfremotevar.h +++ b/src/cdlgmdfremotevar.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -50,15 +50,14 @@ class CDlgMdfRemoteVar : public QDialog { static const int index_name = 0; static const int index_type = 1; - static const int index_page = 2; - static const int index_offset = 3; - static const int index_span = 4; - static const int index_min = 5; - static const int index_max = 6; - static const int index_access = 7; - static const int index_default = 8; - static const int index_fgcolor = 9; - static const int index_bgcolor = 10; + static const int index_span = 2; + static const int index_page = 3; + static const int index_offset = 4; + static const int index_bit_offset = 5; + static const int index_access = 6; + static const int index_default = 7; + static const int index_fgcolor = 8; + static const int index_bgcolor = 9; static const char pre_str_remote_variable[]; @@ -99,25 +98,21 @@ class CDlgMdfRemoteVar : public QDialog { uint32_t getOffset(void); void setOffset(uint32_t offset); + // bit offset + uint32_t getBitOffset(void); + void setBitOffset(uint32_t offset); + // type - uint8_t getType(void); - void setType(uint8_t type); + vscp_remote_variable_type getType(void); + void setType(vscp_remote_variable_type type); // span uint16_t getSpan(void); void setSpan(uint16_t type); - // min - uint8_t getMin(void); - void setMin(uint8_t min); - - // max - uint8_t getMax(void); - void setMax(uint8_t max); - // access mdf_access_mode getAccess(void); - void setAccess(uint8_t access); + void setAccess(mdf_access_mode access); // default QString getDefault(void); diff --git a/src/cdlgmdfremotevar.ui b/src/cdlgmdfremotevar.ui index bee51d7c..c506eda6 100644 --- a/src/cdlgmdfremotevar.ui +++ b/src/cdlgmdfremotevar.ui @@ -13,7 +13,7 @@ Register variable - + 10 @@ -38,7 +38,7 @@ 9 9 581 - 323 + 321 @@ -149,13 +149,23 @@ + + + Byte Count + + + + + + + Register Page - + @@ -169,41 +179,41 @@ - + Register Offset - + - - + + - Size + Bit Offset - - + + - + Access - + Access rights for reemote variable - Read/Write + None @@ -216,16 +226,21 @@ Write Only + + + Read/Write + + - + Default - + @@ -246,14 +261,14 @@ - + fgcolor - + @@ -274,14 +289,14 @@ - + bgcolor - + @@ -302,19 +317,42 @@ - - - - Bit Offset - - - - - - - + + + buttonBox + accepted() + CDlgMdfRemoteVar + accept() + + + 300 + 355 + + + 301 + 189 + + + + + buttonBox + rejected() + CDlgMdfRemoteVar + reject() + + + 300 + 355 + + + 301 + 189 + + + + diff --git a/src/cdlgmdfremotevarlist.cpp b/src/cdlgmdfremotevarlist.cpp index 48f4261e..dcf5a26f 100644 --- a/src/cdlgmdfremotevarlist.cpp +++ b/src/cdlgmdfremotevarlist.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -59,8 +59,6 @@ CDlgMdfRemoteVarList::CDlgMdfRemoteVarList(QWidget* parent) , ui(new Ui::CDlgMdfRemoteVarList) { m_pmdf = nullptr; - m_page = 0; - ui->setupUi(this); vscpworks* pworks = (vscpworks*)QCoreApplication::instance(); @@ -71,7 +69,6 @@ CDlgMdfRemoteVarList::CDlgMdfRemoteVarList(QWidget* parent) connect(ui->btnDelRemoteVar, &QToolButton::clicked, this, &CDlgMdfRemoteVarList::deleteRemoteVar); connect(ui->listRemoteVar, &QListWidget::doubleClicked, this, &CDlgMdfRemoteVarList::editRemoteVar); - setInitialFocus(); this->setFixedSize(this->size()); @@ -103,7 +100,6 @@ CDlgMdfRemoteVarList::initDialogData(CMDF* pmdf, uint16_t page) // Save MDF and page m_pmdf = pmdf; - m_page = page; // m_pmdf->getRegisterMap(m_page, pages); @@ -111,9 +107,9 @@ CDlgMdfRemoteVarList::initDialogData(CMDF* pmdf, uint16_t page) renderRemoteVarItems(); // Fill the page combo with page information - //renderComboPage(); + // renderComboPage(); - //connect(ui->comboPage, SIGNAL(currentIndexChanged(int)), this, SLOT(onPageComboChange(int))); + // connect(ui->comboPage, SIGNAL(currentIndexChanged(int)), this, SLOT(onPageComboChange(int))); } /////////////////////////////////////////////////////////////////////////////// @@ -146,34 +142,47 @@ CDlgMdfRemoteVarList::initDialogData(CMDF* pmdf, uint16_t page) void CDlgMdfRemoteVarList::renderRemoteVarItems(void) { - std::map pages; + std::map rvmap; + std::set sortedSet; if (nullptr == m_pmdf) { return; } + std::deque* rvset = m_pmdf->getRemoteVariableList(); + ui->listRemoteVar->clear(); // Make sorted set of registers on this page - std::deque* regset = m_pmdf->getRemoteVariableList(); - for (auto it = regset->cbegin(); it != regset->cend(); ++it) { - if (m_page == (*it)->getPage()) { - m_registersSet.insert((*it)->getOffset()); - } + for (auto it = rvset->cbegin(); it != rvset->cend(); ++it) { + uint64_t token = ((uint64_t)((*it)->getPage()) << 32) + (*it)->getOffset(); + //qDebug() << Qt::hex << token << (*it)->getPage() << (*it)->getOffset(); + sortedSet.insert(token + (*it)->getOffset()); + rvmap[token + (*it)->getOffset()] = *it; } - // m_pmdf->getRegisterMap(m_page, pages); + //qDebug() << rvset->size(); - // std::deque* regs = m_pmdf->getRemoteVariableList(); + for (auto it1 = sortedSet.cbegin(); it1 != sortedSet.cend(); ++it1) { + CMDF_RemoteVariable* prvar = rvmap[*it1]; + if (nullptr != prvar) { + QString str = QString("%1 [%2:%3]").arg(prvar->getName().c_str()).arg(prvar->getPage()).arg(prvar->getOffset()); + ui->listRemoteVar->addItem(str); + // Set data to register index + ui->listRemoteVar->item(ui->listRemoteVar->count() - 1)->setData(Qt::UserRole, prvar->getOffset()); + ui->listRemoteVar->item(ui->listRemoteVar->count() - 1)->setData(Qt::UserRole + 1, prvar->getPage()); + } + } - // for (auto it = m_registersSet.cbegin(); it != m_registersSet.cend(); ++it) { + // for (auto it = rvset->cbegin(); it != rvset->cend(); ++it) { // // m_registersSet.insert((*it)->getOffset()); - // CMDF_RemoteVariable* preg = m_pmdf->getRegister(*it, m_page); - // if (nullptr != preg) { - // QString str = QString("Register %1 -- %2").arg(preg->getOffset()).arg(preg->getName().c_str()); + // CMDF_RemoteVariable* prvar = *it; + // if (nullptr != prvar) { + // QString str = QString("%1 [%2:%3]").arg(prvar->getName().c_str()).arg(prvar->getPage()).arg(prvar->getOffset()); // ui->listRemoteVar->addItem(str); // // Set data to register index - // ui->listRemoteVar->item(ui->listRemoteVar->count() - 1)->setData(Qt::UserRole, preg->getOffset()); + // ui->listRemoteVar->item(ui->listRemoteVar->count() - 1)->setData(Qt::UserRole, prvar->getOffset()); + // ui->listRemoteVar->item(ui->listRemoteVar->count() - 1)->setData(Qt::UserRole+1, prvar->getPage()); // } // } @@ -198,7 +207,6 @@ CDlgMdfRemoteVarList::setInitialFocus(void) // ui->editGuid->setFocus(); } - /////////////////////////////////////////////////////////////////////////////// // addRemoteVar // @@ -208,7 +216,6 @@ CDlgMdfRemoteVarList::addRemoteVar(void) { bool ok; CMDF_RemoteVariable* pvarnew = new CMDF_RemoteVariable(); - pvarnew->setPage(m_page); // Save the selected row int idx = ui->listRemoteVar->currentRow(); @@ -224,22 +231,13 @@ CDlgMdfRemoteVarList::addRemoteVar(void) // goto addregdlg; // } // qDebug() << "Page=" << pvarnew->getPage() << " Offset=" << pvarnew->getOffset(); - // m_pmdf->getRemoteVariableList()->push_back(pvarnew); - // if (m_page == pvarnew->getPage()) { - // m_registersSet.insert(pvarnew->getOffset()); - // } - // ui->listRemoteVar->clear(); - // renderRemoteVarItems(); - // if (-1 != idx) { - // ui->listRemoteVar->setCurrentRow(idx); - // } - - // Warn if page is not the same as for dialog - if (pvarnew->getPage() != m_page) { - QMessageBox::information(this, - tr("MDF duplicate register"), - tr("Register page=%1 offset=%2 is not on same page [%3] as registers and will be added but not shown.").arg(pvarnew->getPage()).arg(pvarnew->getOffset()).arg(m_page)); + m_pmdf->getRemoteVariableList()->push_back(pvarnew); + ui->listRemoteVar->clear(); + renderRemoteVarItems(); + if (-1 != idx) { + ui->listRemoteVar->setCurrentRow(idx); } + } else { delete pvarnew; @@ -260,8 +258,9 @@ CDlgMdfRemoteVarList::editRemoteVar(void) // Save the selected row int idx = ui->listRemoteVar->currentRow(); - QListWidgetItem* pitem = ui->listRemoteVar->currentItem(); - CMDF_RemoteVariable* pvar = m_pmdf->getRemoteVariable(pitem->data(Qt::UserRole).toUInt(), pitem->data(Qt::UserRole+1).toUInt()); + QListWidgetItem* pitem = ui->listRemoteVar->currentItem(); + CMDF_RemoteVariable* pvar = m_pmdf->getRemoteVariable(pitem->data(Qt::UserRole).toUInt(), + pitem->data(Qt::UserRole + 1).toUInt()); CDlgMdfRemoteVar dlg(this); dlg.initDialogData(m_pmdf, pvar); @@ -290,44 +289,34 @@ CDlgMdfRemoteVarList::dupRemoteVar(void) // Save the selected row int idx = ui->listRemoteVar->currentRow(); - QListWidgetItem* pitem = ui->listRemoteVar->currentItem(); - CMDF_RemoteVariable* pvar = m_pmdf->getRemoteVariable(pitem->data(Qt::UserRole).toUInt(), pitem->data(Qt::UserRole+1).toUInt()); - - CMDF_RemoteVariable* pvarnew = new CMDF_RemoteVariable(); - pvarnew->setPage(m_page); + QListWidgetItem* pitem = ui->listRemoteVar->currentItem(); + CMDF_RemoteVariable* prvar = m_pmdf->getRemoteVariable(pitem->data(Qt::UserRole).toUInt(), pitem->data(Qt::UserRole + 1).toUInt()); + CMDF_RemoteVariable* prvarnew = new CMDF_RemoteVariable(); // Make copy - *pvarnew = *pvar; + *prvarnew = *prvar; CDlgMdfRemoteVar dlg(this); - dlg.initDialogData(m_pmdf, pvarnew); + dlg.initDialogData(m_pmdf, prvarnew); dupregdlg: if (QDialog::Accepted == dlg.exec()) { // Check if register is already defined - CMDF_RemoteVariable* pvarold = m_pmdf->getRemoteVariable(pvarnew->getOffset(), pvarnew->getPage()); + CMDF_RemoteVariable* pvarold = m_pmdf->getRemoteVariable(prvarnew->getOffset(), prvarnew->getPage()); if (nullptr != pvarold) { - QMessageBox::warning(this, tr("MDF duplicate register"), tr("Register page=%1 offset=%2 is already define. Must be unique.").arg(pvarnew->getPage()).arg(pvarnew->getOffset())); + QMessageBox::warning(this, tr("MDF duplicate register"), tr("Register page=%1 offset=%2 is already define. Must be unique.").arg(prvarnew->getPage()).arg(prvarnew->getOffset())); goto dupregdlg; } - qDebug() << "Page=" << pvarnew->getPage() << " Offset=" << pvarnew->getOffset(); - m_pmdf->getRemoteVariableList()->push_back(pvarnew); - if (m_page == pvarnew->getPage()) { - m_registersSet.insert(pvarnew->getOffset()); - } + qDebug() << "Page=" << prvarnew->getPage() << " Offset=" << prvarnew->getOffset(); + m_pmdf->getRemoteVariableList()->push_back(prvarnew); + ui->listRemoteVar->clear(); renderRemoteVarItems(); if (-1 != idx) { ui->listRemoteVar->setCurrentRow(idx); } - // Warn if page is not the same as for dialog - if (pvarnew->getPage() != m_page) { - QMessageBox::information(this, - tr("MDF duplicate register"), - tr("Register page=%1 offset=%2 is not on same page [%3] as registers and will be added but not shown.").arg(pvarnew->getPage()).arg(pvarnew->getOffset()).arg(m_page)); - } } else { - delete pvarnew; + delete prvarnew; } } else { @@ -381,8 +370,8 @@ CDlgMdfRemoteVarList::deleteRemoteVar(void) // Save the row int idx = ui->listRemoteVar->currentRow(); - QListWidgetItem* pitem = ui->listRemoteVar->currentItem(); - CMDF_RemoteVariable* pvar = m_pmdf->getRemoteVariable(pitem->data(Qt::UserRole).toUInt(), pitem->data(Qt::UserRole+1).toUInt()); + QListWidgetItem* pitem = ui->listRemoteVar->currentItem(); + CMDF_RemoteVariable* pvar = m_pmdf->getRemoteVariable(pitem->data(Qt::UserRole).toUInt(), pitem->data(Qt::UserRole + 1).toUInt()); m_pmdf->deleteRemoteVariable(pvar); delete pvar; ui->listRemoteVar->removeItemWidget(pitem); diff --git a/src/cdlgmdfremotevarlist.h b/src/cdlgmdfremotevarlist.h index 14449c93..6e680d74 100644 --- a/src/cdlgmdfremotevarlist.h +++ b/src/cdlgmdfremotevarlist.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -103,11 +103,8 @@ public slots: // MDF CMDF *m_pmdf; - // Register page - uint16_t m_page; - // Used to get a sorted list of registers - std::set m_registersSet ; + //std::set m_remotevarSet ; }; #endif // CDLGMDFREGISTERLIST_H diff --git a/src/cdlgmqttpublish.cpp b/src/cdlgmqttpublish.cpp index f5379c9f..29442252 100644 --- a/src/cdlgmqttpublish.cpp +++ b/src/cdlgmqttpublish.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmqttpublish.h b/src/cdlgmqttpublish.h index cad2f283..34beca50 100644 --- a/src/cdlgmqttpublish.h +++ b/src/cdlgmqttpublish.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmqttsubscribe.cpp b/src/cdlgmqttsubscribe.cpp index f702cf76..3a55d0c4 100644 --- a/src/cdlgmqttsubscribe.cpp +++ b/src/cdlgmqttsubscribe.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgmqttsubscribe.h b/src/cdlgmqttsubscribe.h index 1668691b..24f53335 100644 --- a/src/cdlgmqttsubscribe.h +++ b/src/cdlgmqttsubscribe.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgnewconnection.cpp b/src/cdlgnewconnection.cpp index f305ab74..74845fa2 100644 --- a/src/cdlgnewconnection.cpp +++ b/src/cdlgnewconnection.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgnewconnection.h b/src/cdlgnewconnection.h index 518ae7cc..5d10e270 100644 --- a/src/cdlgnewconnection.h +++ b/src/cdlgnewconnection.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectclass.cpp b/src/cdlgselectclass.cpp index e36c8397..0c313bbd 100644 --- a/src/cdlgselectclass.cpp +++ b/src/cdlgselectclass.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectclass.h b/src/cdlgselectclass.h index 913e2f39..68f01336 100644 --- a/src/cdlgselectclass.h +++ b/src/cdlgselectclass.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectconstraint.cpp b/src/cdlgselectconstraint.cpp index 04ae6ba7..fa763a8b 100644 --- a/src/cdlgselectconstraint.cpp +++ b/src/cdlgselectconstraint.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectconstraint.h b/src/cdlgselectconstraint.h index b516052a..352fd457 100644 --- a/src/cdlgselectconstraint.h +++ b/src/cdlgselectconstraint.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectdata.cpp b/src/cdlgselectdata.cpp index f6b72f50..24f38bc8 100644 --- a/src/cdlgselectdata.cpp +++ b/src/cdlgselectdata.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectdata.h b/src/cdlgselectdata.h index deff6f65..3cd0c828 100644 --- a/src/cdlgselectdata.h +++ b/src/cdlgselectdata.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectdatacoding.cpp b/src/cdlgselectdatacoding.cpp index 32d21da0..df9be1eb 100644 --- a/src/cdlgselectdatacoding.cpp +++ b/src/cdlgselectdatacoding.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectdatacoding.h b/src/cdlgselectdatacoding.h index 6dc542e7..b5de2ecb 100644 --- a/src/cdlgselectdatacoding.h +++ b/src/cdlgselectdatacoding.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectdatasize.cpp b/src/cdlgselectdatasize.cpp index 0eed9b11..1bc67a1c 100644 --- a/src/cdlgselectdatasize.cpp +++ b/src/cdlgselectdatasize.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectdatasize.h b/src/cdlgselectdatasize.h index b12813cc..97cbaf69 100644 --- a/src/cdlgselectdatasize.h +++ b/src/cdlgselectdatasize.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectdate.cpp b/src/cdlgselectdate.cpp index d76942be..6d85c30f 100644 --- a/src/cdlgselectdate.cpp +++ b/src/cdlgselectdate.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectdate.h b/src/cdlgselectdate.h index 94d82de0..5615ecff 100644 --- a/src/cdlgselectdate.h +++ b/src/cdlgselectdate.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectguid.cpp b/src/cdlgselectguid.cpp index 75c9a7b2..ec56738d 100644 --- a/src/cdlgselectguid.cpp +++ b/src/cdlgselectguid.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectguid.h b/src/cdlgselectguid.h index 3f6e357e..81dfc5b4 100644 --- a/src/cdlgselectguid.h +++ b/src/cdlgselectguid.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectmeasurementvalue.cpp b/src/cdlgselectmeasurementvalue.cpp index 98d77fb3..133fa095 100644 --- a/src/cdlgselectmeasurementvalue.cpp +++ b/src/cdlgselectmeasurementvalue.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectmeasurementvalue.h b/src/cdlgselectmeasurementvalue.h index 4ced46f9..c4375291 100644 --- a/src/cdlgselectmeasurementvalue.h +++ b/src/cdlgselectmeasurementvalue.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectobid.cpp b/src/cdlgselectobid.cpp index 0f9c25a5..d45e0ee1 100644 --- a/src/cdlgselectobid.cpp +++ b/src/cdlgselectobid.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectobid.h b/src/cdlgselectobid.h index 54985e70..22eb28b0 100644 --- a/src/cdlgselectobid.h +++ b/src/cdlgselectobid.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectpriority.cpp b/src/cdlgselectpriority.cpp index 1eff1c81..ffb155b3 100644 --- a/src/cdlgselectpriority.cpp +++ b/src/cdlgselectpriority.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectpriority.h b/src/cdlgselectpriority.h index 48f96471..cc81a02f 100644 --- a/src/cdlgselectpriority.h +++ b/src/cdlgselectpriority.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectsensorindex.cpp b/src/cdlgselectsensorindex.cpp index af9ab5a0..3fd3b2ec 100644 --- a/src/cdlgselectsensorindex.cpp +++ b/src/cdlgselectsensorindex.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectsensorindex.h b/src/cdlgselectsensorindex.h index 1adb4d80..ec323a7e 100644 --- a/src/cdlgselectsensorindex.h +++ b/src/cdlgselectsensorindex.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselecttimestamp.cpp b/src/cdlgselecttimestamp.cpp index 4e65ab30..35dc5341 100644 --- a/src/cdlgselecttimestamp.cpp +++ b/src/cdlgselecttimestamp.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselecttimestamp.h b/src/cdlgselecttimestamp.h index 7dc1cf01..08a1f081 100644 --- a/src/cdlgselecttimestamp.h +++ b/src/cdlgselecttimestamp.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectunit.cpp b/src/cdlgselectunit.cpp index d546633a..a9abfddc 100644 --- a/src/cdlgselectunit.cpp +++ b/src/cdlgselectunit.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgselectunit.h b/src/cdlgselectunit.h index 7785b1ba..6154d9a0 100644 --- a/src/cdlgselectunit.h +++ b/src/cdlgselectunit.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgsensorindex.cpp b/src/cdlgsensorindex.cpp index 7435d897..4cf54374 100644 --- a/src/cdlgsensorindex.cpp +++ b/src/cdlgsensorindex.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgsensorindex.h b/src/cdlgsensorindex.h index 151d6e4c..3b128a7a 100644 --- a/src/cdlgsensorindex.h +++ b/src/cdlgsensorindex.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgsessionfilter.cpp b/src/cdlgsessionfilter.cpp index 6c09bc92..11871c7e 100644 --- a/src/cdlgsessionfilter.cpp +++ b/src/cdlgsessionfilter.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgsessionfilter.h b/src/cdlgsessionfilter.h index c71eb684..82cf4b81 100644 --- a/src/cdlgsessionfilter.h +++ b/src/cdlgsessionfilter.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgsocketcanflags.cpp b/src/cdlgsocketcanflags.cpp index ed3c97d2..ba42493b 100644 --- a/src/cdlgsocketcanflags.cpp +++ b/src/cdlgsocketcanflags.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgsocketcanflags.h b/src/cdlgsocketcanflags.h index c379b819..c00cce34 100644 --- a/src/cdlgsocketcanflags.h +++ b/src/cdlgsocketcanflags.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgtls.cpp b/src/cdlgtls.cpp index e3b2c628..eaa26207 100644 --- a/src/cdlgtls.cpp +++ b/src/cdlgtls.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgtls.h b/src/cdlgtls.h index 2bbc5e47..5745d513 100644 --- a/src/cdlgtls.h +++ b/src/cdlgtls.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgtxedit.cpp b/src/cdlgtxedit.cpp index 263ea5ae..e122f112 100644 --- a/src/cdlgtxedit.cpp +++ b/src/cdlgtxedit.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cdlgtxedit.h b/src/cdlgtxedit.h index 38cd8662..57bce167 100644 --- a/src/cdlgtxedit.h +++ b/src/cdlgtxedit.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cfrmmdf.cpp b/src/cfrmmdf.cpp index 681f0ce9..dd1b7015 100644 --- a/src/cfrmmdf.cpp +++ b/src/cfrmmdf.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -67,6 +67,8 @@ #include "cdlgmdfregisterlist.h" #include "cdlgmdfregistervalue.h" #include "cdlgmdfregistervaluelist.h" +#include "cdlgmdfremotevarlist.h" +#include "cdlgmdfremotevar.h" #include #include @@ -1067,7 +1069,7 @@ CFrmMdf::renderRegisterInfo(QTreeWidgetItem* pParent, CMDF_Register* preg) renderDescriptionItems(pParent, preg, preg->getMapDescription()); // Info URL's - renderInfoUrlItems(pParent, preg, preg->getMapDescription()); + renderInfoUrlItems(pParent, preg, preg->getMapInfoUrl()); } /////////////////////////////////////////////////////////////////////////////// @@ -1130,7 +1132,7 @@ CFrmMdf::renderRegisters(QTreeWidgetItem* pParent) // void -CFrmMdf::renderRemoteVariableInfo(QTreeWidgetItem* pParent, CMDF_RemoteVariable* pvar) +CFrmMdf::renderRemoteVariableInfo(QTreeWidgetItem* pParent, CMDF_RemoteVariable* prvar) { QString str; QMdfTreeWidgetItem* pItem; @@ -1139,66 +1141,66 @@ CFrmMdf::renderRemoteVariableInfo(QTreeWidgetItem* pParent, CMDF_RemoteVariable* if (nullptr == pParent) { return; } - if (nullptr == pvar) { + if (nullptr == prvar) { return; } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_string); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_name); if (nullptr != pItem) { - str = QString("Name: %1").arg(pvar->getName().c_str()); + str = QString("Name: %1").arg(prvar->getName().c_str()); pItem->setText(0, str); pParent->addChild(pParent); } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_string); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_type); if (nullptr != pItem) { - str = QString("Type: %1 (%2)").arg(pvar->getType()).arg(pvar->getTypeString().c_str()); + str = QString("Type: %1 (%2)").arg(prvar->getType()).arg(prvar->getTypeString().c_str()); pItem->setText(0, str); pParent->addChild(pItem); } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_number); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_span); if (nullptr != pItem) { - str = QString("Byte count: %1").arg(pvar->getTypeByteCount()); + str = QString("Byte count: %1").arg(prvar->getTypeByteCount()); pItem->setText(0, str); pParent->addChild(pItem); } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_number); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_default); if (nullptr != pItem) { - str = QString("Default: %1").arg(pvar->getDefault().c_str()); + str = QString("Default: %1").arg(prvar->getDefault().c_str()); pItem->setText(0, str); pParent->addChild(pItem); } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_number); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_offset); if (nullptr != pItem) { - str = QString("Offset: %1").arg(pvar->getOffset()); + str = QString("Offset: %1").arg(prvar->getOffset()); pItem->setText(0, str); pParent->addChild(pItem); } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_number); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_page); if (nullptr != pItem) { - str = QString("Page: %1").arg(pvar->getPage()); + str = QString("Page: %1").arg(prvar->getPage()); pItem->setText(0, str); pParent->addChild(pItem); } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_number); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_bit_offset); if (nullptr != pItem) { - str = QString("Bit position: %1").arg(pvar->getBitPos()); + str = QString("Bit position: %1").arg(prvar->getBitPos()); pItem->setText(0, str); pParent->addChild(pItem); } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_access); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_access); if (nullptr != pItem) { - str = QString("Access: %1 (").arg(pvar->getAccess()); - if (2 & pvar->getAccess()) { + str = QString("Access: %1 (").arg(static_cast(prvar->getAccess())); + if (1 & prvar->getAccess()) { str += "r"; } - if (1 & pvar->getAccess()) { + if (2 & prvar->getAccess()) { str += "w"; } str += ")"; @@ -1207,31 +1209,31 @@ CFrmMdf::renderRemoteVariableInfo(QTreeWidgetItem* pParent, CMDF_RemoteVariable* pParent->addChild(pItem); } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_string); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_fgcolor); if (nullptr != pItem) { - str = QString("Foreground color: 0x%1").arg(pvar->getForegroundColor(), 1, 16); + str = QString("Foreground color: 0x%1").arg(prvar->getForegroundColor(), 1, 16); pItem->setText(0, str); pParent->addChild(pItem); } - pItem = new QMdfTreeWidgetItem(pParent, mdf_type_generic_string); + pItem = new QMdfTreeWidgetItem(pParent, prvar, mdf_type_remotevar_sub_item, CDlgMdfRemoteVar::index_bgcolor); if (nullptr != pItem) { - str = QString("Background color: 0x%1").arg(pvar->getBackgroundColor(), 1, 16); + str = QString("Background color: 0x%1").arg(prvar->getBackgroundColor(), 1, 16); pItem->setText(0, str); pParent->addChild(pItem); } // Fill in bit field info - renderBits(pParent, *pvar->getListBits()); + renderBits(pParent, *prvar->getListBits()); // Fill in valid values - renderValues(pParent, *pvar->getListValues()); + renderValues(pParent, *prvar->getListValues()); // Descriptions - renderDescriptionItems(pParent, pvar, pvar->getMapDescription()); + renderDescriptionItems(pParent, prvar, prvar->getMapDescription()); // Info URL's - renderInfoUrlItems(pParent, pvar, pvar->getMapDescription()); + renderInfoUrlItems(pParent, prvar, prvar->getMapInfoUrl()); } /////////////////////////////////////////////////////////////////////////////// @@ -1256,9 +1258,9 @@ CFrmMdf::renderRemoteVariables(QTreeWidgetItem* pParent) for (int i = 0; i < pRemoteVarList->size(); i++) { CMDF_RemoteVariable* pvar = (*pRemoteVarList)[i]; - pSubItem = new QMdfTreeWidgetItem(pParent, mdf_type_remotevar_item); + pSubItem = new QMdfTreeWidgetItem(pParent, pvar, mdf_type_remotevar_item); if (nullptr != pSubItem) { - str = QString("Remote variable: %1 -- %2").arg(i).arg(pvar->getName().c_str()); + str = QString("%1 %2").arg(CDlgMdfRemoteVar::pre_str_remote_variable).arg(pvar->getName().c_str()); pSubItem->setText(0, str); pParent->addChild(pSubItem); renderRemoteVariableInfo(pSubItem, pvar); @@ -2369,7 +2371,7 @@ CFrmMdf::loadMdf(void) // * * * Remote variables * * * - QMdfTreeWidgetItem* pItemRemoteVar = new QMdfTreeWidgetItem(pItemModule, mdf_type_remotevar); + QMdfTreeWidgetItem* pItemRemoteVar = new QMdfTreeWidgetItem(pItemModule, &m_mdf, mdf_type_remotevar); m_headRemoteVariabel = pItemRemoteVar; pItemRemoteVar->setFont(0, fontTopItem); pItemRemoteVar->setForeground(0, greenBrush); @@ -2380,7 +2382,7 @@ CFrmMdf::loadMdf(void) // * * * Alarm * * * - QMdfTreeWidgetItem* pItemAlarm = new QMdfTreeWidgetItem(pItemModule, mdf_type_alarm); + QMdfTreeWidgetItem* pItemAlarm = new QMdfTreeWidgetItem(pItemModule, &m_mdf, mdf_type_alarm); m_headAlarm = pItemAlarm; pItemAlarm->setFont(0, fontTopItem); pItemAlarm->setForeground(0, greenBrush); @@ -2394,7 +2396,7 @@ CFrmMdf::loadMdf(void) // * * * Decision Matrix * * * - QMdfTreeWidgetItem* pItemDM = new QMdfTreeWidgetItem(pItemModule, mdf_type_decision_matrix); + QMdfTreeWidgetItem* pItemDM = new QMdfTreeWidgetItem(pItemModule, &m_mdf, mdf_type_decision_matrix); m_headDecisionMatrix = pItemDM; pItemDM->setFont(0, fontTopItem); pItemDM->setForeground(0, greenBrush); @@ -2546,7 +2548,7 @@ CFrmMdf::loadMdf(void) // * * * Events * * * - QMdfTreeWidgetItem* pItemEvent = new QMdfTreeWidgetItem(pItemModule, mdf_type_event); + QMdfTreeWidgetItem* pItemEvent = new QMdfTreeWidgetItem(pItemModule, &m_mdf, mdf_type_event); pItemEvent = pItemEvent; pItemEvent->setFont(0, fontTopItem); pItemEvent->setForeground(0, greenBrush); @@ -3803,6 +3805,12 @@ CFrmMdf::editDescription(void) pmap = pItem->getObject()->getMapDescription(); } break; + case mdf_type_remotevar: + case mdf_type_remotevar_item: + case mdf_type_remotevar_sub_item: { + pmap = pItem->getObject()->getMapDescription(); + } break; + case mdf_type_bit: case mdf_type_bit_item: case mdf_type_bit_sub_item: { @@ -3907,6 +3915,10 @@ CFrmMdf::deleteDescription(void) case mdf_type_register: case mdf_type_register_item: case mdf_type_register_sub_item: + // Remote variable items + case mdf_type_remotevar: + case mdf_type_remotevar_item: + case mdf_type_remotevar_sub_item: // Bit items case mdf_type_bit: case mdf_type_bit_item: @@ -4017,6 +4029,10 @@ CFrmMdf::editInfoUrl(void) case mdf_type_register: case mdf_type_register_item: case mdf_type_register_sub_item: + // Remote variable items + case mdf_type_remotevar: + case mdf_type_remotevar_item: + case mdf_type_remotevar_sub_item: // Bit items case mdf_type_bit: case mdf_type_bit_item: @@ -4120,6 +4136,10 @@ CFrmMdf::deleteInfoUrl(void) case mdf_type_register: case mdf_type_register_item: case mdf_type_register_sub_item: + // Remote variable items + case mdf_type_remotevar: + case mdf_type_remotevar_item: + case mdf_type_remotevar_sub_item: // Bit items case mdf_type_bit: case mdf_type_bit_item: @@ -5953,35 +5973,31 @@ CFrmMdf::editRemoteVariable(void) switch (pItem->getObjectType()) { - case mdf_type_register_page: { - CDlgMdfRegisterList dlg(this); + case mdf_type_remotevar: { + CDlgMdfRemoteVarList dlg(this); dlg.initDialogData(&m_mdf, selectedIndex); if (QDialog::Accepted == dlg.exec()) { // Redraw all register items - We do not know changes - QList childrenList = m_headRegister->takeChildren(); + QList childrenList = m_headRemoteVariabel->takeChildren(); // Remove children for (qsizetype i = 0; i < childrenList.size(); ++i) { QMdfTreeWidgetItem* item = (QMdfTreeWidgetItem*)childrenList.at(i); delete item; } childrenList.clear(); - renderRegisters(m_headRegister); + renderRemoteVariables(m_headRemoteVariabel); } } break; - case mdf_type_remotevar: { - // Should not come here. But if we do don't do an anything. :)))) - } break; - case mdf_type_remotevar_item: { - CMDF_Register* preg = (CMDF_Register*)pItem->getObject(); - if (nullptr == preg) { + CMDF_RemoteVariable* pvar = (CMDF_RemoteVariable*)pItem->getObject(); + if (nullptr == pvar) { int ret = QMessageBox::critical(this, tr("APPNAME"), tr("Internal error: Invalid firmware object")); - spdlog::error("MDF register edit - object has nullptr"); + spdlog::error("MDF remotevar edit - object has nullptr"); return; } - CDlgMdfRegister dlg(this); - dlg.initDialogData(&m_mdf, preg, selectedIndex); + CDlgMdfRemoteVar dlg(this); + dlg.initDialogData(&m_mdf, pvar, selectedIndex); if (QDialog::Accepted == dlg.exec()) { pItem->setExpanded(true); QList childrenList = pItem->takeChildren(); @@ -5991,20 +6007,21 @@ CFrmMdf::editRemoteVariable(void) delete item; } childrenList.clear(); - pItem->setText(0, QString("Register %1 %2").arg(preg->getOffset()).arg(preg->getName().c_str())); - renderRegisterInfo(pItem, preg); + QString str = QString("Remote variable: %1").arg(pvar->getName().c_str()); + pItem->setText(0, str); + renderRemoteVariableInfo(pItem, pvar); } } break; case mdf_type_remotevar_sub_item: { - CMDF_Register* preg = (CMDF_Register*)pItem->getObject(); - if (nullptr == preg) { + CMDF_RemoteVariable* prvar = (CMDF_RemoteVariable*)pItem->getObject(); + if (nullptr == prvar) { int ret = QMessageBox::critical(this, tr("APPNAME"), tr("Internal error: Invalid firmware object")); - spdlog::error("MDF register edit - object has nullptr"); + spdlog::error("MDF remote variable edit - object has nullptr"); return; } - CDlgMdfRegister dlg(this); - dlg.initDialogData(&m_mdf, preg, selectedIndex); + CDlgMdfRemoteVar dlg(this); + dlg.initDialogData(&m_mdf, prvar, selectedIndex); if (QDialog::Accepted == dlg.exec()) { pItemHead->setExpanded(true); QList childrenList = pItemHead->takeChildren(); @@ -6015,8 +6032,8 @@ CFrmMdf::editRemoteVariable(void) delete item; } childrenList.clear(); - pItemHead->setText(0, QString("Register %1 %2").arg(preg->getOffset()).arg(preg->getName().c_str())); - renderRegisterInfo(pItemHead, preg); + pItemHead->setText(0, QString("%1 %2").arg(CDlgMdfRemoteVar::pre_str_remote_variable).arg(prvar->getName().c_str())); + renderRemoteVariableInfo(pItemHead, prvar); } } break; } diff --git a/src/cfrmmdf.h b/src/cfrmmdf.h index b8f983e2..84ccffe2 100644 --- a/src/cfrmmdf.h +++ b/src/cfrmmdf.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cfrmnodeconfig.cpp b/src/cfrmnodeconfig.cpp index b94b957e..a93d6fc7 100644 --- a/src/cfrmnodeconfig.cpp +++ b/src/cfrmnodeconfig.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cfrmnodeconfig.h b/src/cfrmnodeconfig.h index 9112ebeb..2898d653 100644 --- a/src/cfrmnodeconfig.h +++ b/src/cfrmnodeconfig.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cfrmnodescan.cpp b/src/cfrmnodescan.cpp index 54faa38e..f53fd98e 100644 --- a/src/cfrmnodescan.cpp +++ b/src/cfrmnodescan.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cfrmnodescan.h b/src/cfrmnodescan.h index c01bcde1..ca508cd6 100644 --- a/src/cfrmnodescan.h +++ b/src/cfrmnodescan.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cfrmsession.cpp b/src/cfrmsession.cpp index 54b07726..67f52cd1 100644 --- a/src/cfrmsession.cpp +++ b/src/cfrmsession.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/cfrmsession.h b/src/cfrmsession.h index f28a1a19..d121356e 100644 --- a/src/cfrmsession.h +++ b/src/cfrmsession.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/ctxevent.cpp b/src/ctxevent.cpp index 49ea678d..28fc5283 100644 --- a/src/ctxevent.cpp +++ b/src/ctxevent.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // "First they ignore you, then they laugh at you, then they fight you, then you win” diff --git a/src/ctxevent.h b/src/ctxevent.h index 297508ac..97dabb5a 100644 --- a/src/ctxevent.h +++ b/src/ctxevent.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // "First they ignore you, then they laugh at you, then they fight you, then you win” diff --git a/src/eventlistmodel.cpp b/src/eventlistmodel.cpp index 3e8f962c..2b8c1642 100644 --- a/src/eventlistmodel.cpp +++ b/src/eventlistmodel.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/eventlistmodel.h b/src/eventlistmodel.h index a9269d43..a0affb00 100644 --- a/src/eventlistmodel.h +++ b/src/eventlistmodel.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/filedownloader.cpp b/src/filedownloader.cpp index 1ce68c81..f2712313 100644 --- a/src/filedownloader.cpp +++ b/src/filedownloader.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/filedownloader.h b/src/filedownloader.h index 054b73bb..38e547cb 100644 --- a/src/filedownloader.h +++ b/src/filedownloader.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/iso639.h b/src/iso639.h index 1a8738af..b3c98ecc 100644 --- a/src/iso639.h +++ b/src/iso639.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 49b97026..b1ad506d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/mainwindow.h b/src/mainwindow.h index 1d165638..32e4484a 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/sessionfilter.cpp b/src/sessionfilter.cpp index b0302b0c..547b817b 100644 --- a/src/sessionfilter.cpp +++ b/src/sessionfilter.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/sessionfilter.h b/src/sessionfilter.h index 5955aec7..9a85abad 100644 --- a/src/sessionfilter.h +++ b/src/sessionfilter.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/version.h b/src/version.h index 51641dba..3fd48df3 100644 --- a/src/version.h +++ b/src/version.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -44,7 +44,7 @@ #define VSCPWORKS_DISPLAY_VERSION "0.0.1-0 Alpha" #define VSCPWORKS_COPYRIGHT \ - "Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB, " \ + "Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB, " \ "https://www.grodansparadis.com" #define VSCPWORKS_COPYRIGHT_HTML \ "Copyright © 2000-2021 Åke Hedman, // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/vscpworks.h b/src/vscpworks.h index 996cc5cb..c3bb3eb1 100644 --- a/src/vscpworks.h +++ b/src/vscpworks.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/widgetgraph.cpp b/src/widgetgraph.cpp index 33ae297b..aeb3dc35 100644 --- a/src/widgetgraph.cpp +++ b/src/widgetgraph.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/widgetgraph.h b/src/widgetgraph.h index 7e1a31fa..a78de466 100644 --- a/src/widgetgraph.h +++ b/src/widgetgraph.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/xyseries.cpp b/src/xyseries.cpp index 00443361..01ccb179 100644 --- a/src/xyseries.cpp +++ b/src/xyseries.cpp @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/xyseries.h b/src/xyseries.h index 1b55b33a..ddffde03 100644 --- a/src/xyseries.h +++ b/src/xyseries.h @@ -4,7 +4,7 @@ // // The MIT License (MIT) // -// Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +// Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/tools/canal_mdf_to_code.py b/tools/canal_mdf_to_code.py index 7dabb965..653a6e76 100644 --- a/tools/canal_mdf_to_code.py +++ b/tools/canal_mdf_to_code.py @@ -4,7 +4,7 @@ # # The MIT License (MIT) # -# Copyright © 2000-2023 Ake Hedman, Grodans Paradis AB +# Copyright © 2000-2024 Ake Hedman, Grodans Paradis AB # # # Permission is hereby granted, free of charge, to any person obtaining a copy