[education/rkward] rkward/dataeditor: Merge branch 'work/remove_rkglobals_h'

[Thomas Friedrichsmeier]

Git commit 3bcfdade8a9df0a7861f6639654a3710a52c78f1 by Thomas Friedrichsmeier.
Committed on 14/04/2022 at 21:13.
Pushed by tfry into branch 'master'.

Merge branch 'work/remove_rkglobals_h'

M  +5    -7    rkward/dataeditor/rkeditordataframe.cpp

https://invent.kde.org/education/rkward/commit/3bcfdade8a9df0a7861f6639654a3710a52c78f1

diff --cc rkward/dataeditor/rkeditordataframe.cpp
index 2d16a51a,fdc74982..e8069be5
--- a/rkward/dataeditor/rkeditordataframe.cpp
+++ b/rkward/dataeditor/rkeditordataframe.cpp
@@@ -61,8 -60,7 +60,8 @@@ RKEditorDataFrame::RKEditorDataFrame (c
  	initTable (model, object);
  	connect (model, &RKVarEditDataFrameModel::modelObjectDestroyed, this, &RKEditorDataFrame::deleteLater);
  
- 	RKGlobals::rInterface ()->closeChain (open_chain);
+ 	RInterface::closeChain (open_chain);
 +	open_chain = nullptr;
  }
  
  void RKEditorDataFrame::commonInit () {
@@@ -107,9 -105,9 +106,8 @@@ void RKEditorDataFrame::rCommandDone (R
  	RK_TRACE (EDITOR);
  
  	if (command->getFlags () == LOAD_COMPLETE_COMMAND) {
- 		RKGlobals::rInterface ()->closeChain (open_chain);
+ 		RInterface::closeChain (open_chain);
 -		open_chain = 0;
 -
 +		open_chain = nullptr;
- 
  		enableEditing (true);
  	}
  }