Branch: master

4f6b41af 2019-05-29 06:14:42 Michele Calgaro
Adjusted to latest TQVariant::TQVariant(bool) function.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M src/common/global/generic_config.cpp
M src/common/gui/config_widget.h
M src/libgui/global_config.cpp
M src/progs/base/debug_config.cpp
M src/progs/base/prog_config.cpp

src/common/global/generic_config.cpp

diff --git a/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp
index 63f3f08..a4a8827 100644
--- a/src/common/global/generic_config.cpp
+++ b/src/common/global/generic_config.cpp
@@ -223,7 +223,7 @@
 TQVariant GenericConfig::readVariantEntry(const TQString &key, const TQVariant &defValue) const
 {
   switch (defValue.type()) {
-    case TQVariant::Bool: return TQVariant(readBoolEntry(key, defValue.toBool()), 0);
+    case TQVariant::Bool: return TQVariant(readBoolEntry(key, defValue.toBool()));
     case TQVariant::UInt: return readUIntEntry(key, defValue.toUInt());
     default: break;
   }

src/common/gui/config_widget.h

diff --git a/src/common/gui/config_widget.h b/src/common/gui/config_widget.h
index 28fc4eb..e981aac 100644
--- a/src/common/gui/config_widget.h
+++ b/src/common/gui/config_widget.h
@@ -78,7 +78,7 @@
   void save(Type type, TQWidget *widget) {
     switch (type.data().defValue.type()) {
       case TQVariant::Bool:
-        writeConfigEntry(type, TQVariant(static_cast<TQCheckBox *>(widget)->isChecked(), 0));
+        writeConfigEntry(type, TQVariant(static_cast<TQCheckBox *>(widget)->isChecked()));
         break;
       default: Q_ASSERT(false); break;
     }

src/libgui/global_config.cpp

diff --git a/src/libgui/global_config.cpp b/src/libgui/global_config.cpp
index d85eadd..2f8c6a7 100644
--- a/src/libgui/global_config.cpp
+++ b/src/libgui/global_config.cpp
@@ -17,10 +17,10 @@
 #include "tools/list/tool_list.h"
 
 const BaseGlobalConfig::Data BaseGlobalConfig::DATA[Nb_Types] = {
-  { "auto_rebuild_modified", I18N_NOOP("Automatically rebuild project before programming if it is modified."), TQVariant(true, 0) },
-  { "program_after_build", I18N_NOOP("Program device after successful build."), TQVariant(false, 0) },
-  { "user_id_set_to_checksum", I18N_NOOP("Set User Ids to unprotected checksum (if User Ids are empty)."), TQVariant(false, 0) },
-  { "show_tab_close_buttons", I18N_NOOP("Show close buttons on tabs (need restart to take effect)."), TQVariant(true, 0) }
+  { "auto_rebuild_modified", I18N_NOOP("Automatically rebuild project before programming if it is modified."), TQVariant(true) },
+  { "program_after_build", I18N_NOOP("Program device after successful build."), TQVariant(false) },
+  { "user_id_set_to_checksum", I18N_NOOP("Set User Ids to unprotected checksum (if User Ids are empty)."), TQVariant(false) },
+  { "show_tab_close_buttons", I18N_NOOP("Show close buttons on tabs (need restart to take effect)."), TQVariant(true) }
 };
 
 PURL::Url GlobalConfig::openedProject()

src/progs/base/debug_config.cpp

diff --git a/src/progs/base/debug_config.cpp b/src/progs/base/debug_config.cpp
index b1bbda4..a980478 100644
--- a/src/progs/base/debug_config.cpp
+++ b/src/progs/base/debug_config.cpp
@@ -9,6 +9,6 @@
 #include "debug_config.h"
 
 const Debugger::Config::Data Debugger::Config::DATA[Nb_Types] = {
-  { "only_stop_on_source_line", I18N_NOOP("Only stop stepping on source line."), TQVariant(true, 0) },
-  { "only_stop_on_project_source_line", I18N_NOOP("Only stop stepping on project source line."), TQVariant(true, 0) }
+  { "only_stop_on_source_line", I18N_NOOP("Only stop stepping on source line."), TQVariant(true) },
+  { "only_stop_on_project_source_line", I18N_NOOP("Only stop stepping on project source line."), TQVariant(true) }
 };

src/progs/base/prog_config.cpp

diff --git a/src/progs/base/prog_config.cpp b/src/progs/base/prog_config.cpp
index b9d88b6..b2d5472 100644
--- a/src/progs/base/prog_config.cpp
+++ b/src/progs/base/prog_config.cpp
@@ -66,13 +66,13 @@
 
 //----------------------------------------------------------------------------
 const Programmer::Config::Data Programmer::Config::DATA[Nb_Types] = {
-  { "only_program_non_mask", I18N_NOOP("Only program what is needed (faster)."), TQVariant(true, 0) },
-  { "verify_after_program", I18N_NOOP("Verify device memory after programming."), TQVariant(true, 0) },
-  { "only_verify_programmed", I18N_NOOP("Only verify programmed words in code memory (faster)."), TQVariant(true, 0) },
-  { "power_down_after_programming", I18N_NOOP("Power down target after programming."), TQVariant(true, 0) },
-  { "target_self_powered", I18N_NOOP("Target is self-powered (when possible)."), TQVariant(true, 0) },
-  { "blank_check_after_erase", I18N_NOOP("Blank check after erase."), TQVariant(false, 0) },
-  { "preserve_eeprom", I18N_NOOP("Preserve data EEPROM when programming."), TQVariant(false, 0) },
-  { "program_eeprom", I18N_NOOP("Program data EEPROM."), TQVariant(true, 0) },
-  { "run_after_program", I18N_NOOP("Run device after successful programming."), TQVariant(false, 0) }
+  { "only_program_non_mask", I18N_NOOP("Only program what is needed (faster)."), TQVariant(true) },
+  { "verify_after_program", I18N_NOOP("Verify device memory after programming."), TQVariant(true) },
+  { "only_verify_programmed", I18N_NOOP("Only verify programmed words in code memory (faster)."), TQVariant(true) },
+  { "power_down_after_programming", I18N_NOOP("Power down target after programming."), TQVariant(true) },
+  { "target_self_powered", I18N_NOOP("Target is self-powered (when possible)."), TQVariant(true) },
+  { "blank_check_after_erase", I18N_NOOP("Blank check after erase."), TQVariant(false) },
+  { "preserve_eeprom", I18N_NOOP("Preserve data EEPROM when programming."), TQVariant(false) },
+  { "program_eeprom", I18N_NOOP("Program data EEPROM."), TQVariant(true) },
+  { "run_after_program", I18N_NOOP("Run device after successful programming."), TQVariant(false) }
 };