浏览代码

UI: Use "enabled" instead of "disabled" variable name

Avoids double-negative naming.
jp9000 4 年之前
父节点
当前提交
edc82eb7cf
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 4 4
      UI/undo-stack-obs.cpp
  2. 1 1
      UI/undo-stack-obs.hpp

+ 4 - 4
UI/undo-stack-obs.cpp

@@ -64,7 +64,7 @@ void undo_stack::add_action(const QString &name, undo_redo_cb undo,
 
 
 void undo_stack::undo()
 void undo_stack::undo()
 {
 {
-	if (undo_items.size() == 0 || disabled)
+	if (undo_items.size() == 0 || !enabled)
 		return;
 		return;
 
 
 	last_is_repeatable = false;
 	last_is_repeatable = false;
@@ -88,7 +88,7 @@ void undo_stack::undo()
 
 
 void undo_stack::redo()
 void undo_stack::redo()
 {
 {
-	if (redo_items.size() == 0 || disabled)
+	if (redo_items.size() == 0 || !enabled)
 		return;
 		return;
 
 
 	last_is_repeatable = false;
 	last_is_repeatable = false;
@@ -112,7 +112,7 @@ void undo_stack::redo()
 
 
 void undo_stack::enable()
 void undo_stack::enable()
 {
 {
-	disabled = false;
+	enabled = true;
 	last_is_repeatable = false;
 	last_is_repeatable = false;
 
 
 	ui->actionMainUndo->setDisabled(false);
 	ui->actionMainUndo->setDisabled(false);
@@ -122,7 +122,7 @@ void undo_stack::enable()
 
 
 void undo_stack::disable()
 void undo_stack::disable()
 {
 {
-	disabled = true;
+	enabled = false;
 	last_is_repeatable = false;
 	last_is_repeatable = false;
 
 
 	ui->actionMainUndo->setDisabled(true);
 	ui->actionMainUndo->setDisabled(true);

+ 1 - 1
UI/undo-stack-obs.hpp

@@ -29,7 +29,7 @@ class undo_stack : public QObject {
 	ui_ptr ui;
 	ui_ptr ui;
 	std::deque<undo_redo_t> undo_items;
 	std::deque<undo_redo_t> undo_items;
 	std::deque<undo_redo_t> redo_items;
 	std::deque<undo_redo_t> redo_items;
-	bool disabled = false;
+	bool enabled = true;
 	bool last_is_repeatable = false;
 	bool last_is_repeatable = false;
 
 
 	QTimer repeat_reset_timer;
 	QTimer repeat_reset_timer;