[education/rkward] rkward: Remove more runtime warnings
Thomas Friedrichsmeier
null at kde.org
Sat Apr 9 15:09:25 BST 2022
Git commit 8be728de530740293f75b4d4a129ec6132ae1e58 by Thomas Friedrichsmeier.
Committed on 09/04/2022 at 14:09.
Pushed by tfry into branch 'master'.
Remove more runtime warnings
M +1 -2 rkward/core/robject.cpp
M +1 -1 rkward/misc/rkxmlguipreviewarea.cpp
https://invent.kde.org/education/rkward/commit/8be728de530740293f75b4d4a129ec6132ae1e58
diff --git a/rkward/core/robject.cpp b/rkward/core/robject.cpp
index 55a52cfa..2e6caae7 100644
--- a/rkward/core/robject.cpp
+++ b/rkward/core/robject.cpp
@@ -217,8 +217,7 @@ void RObject::updateFromR (RCommandChain *chain) {
// We handle objects directly in .GlobalEnv differently. That's to avoid forcing promises, when addressing the object directly. In the long run, .rk.get.structure should be reworked to simply not need the value-argument in any case.
command = new RCommand (".rk.get.structure.global (" + rQuote (getShortName ()) + ')', RCommand::App | RCommand::Sync | RCommand::GetStructuredData, QString (), this, ROBJECT_UDPATE_STRUCTURE_COMMAND);
} else {
- RK_ASSERT (false); // non-catastrophic, but do we get here?
-
+// This is the less common branch, but we do call .rk.get.structure on sub-object, e.g. when fetching more levels in the Workspace Browser, or when calling rk.sync(), explicitly
command = new RCommand (".rk.get.structure (" + getFullName () + ", " + rQuote (getShortName ()) + ')', RCommand::App | RCommand::Sync | RCommand::GetStructuredData, QString (), this, ROBJECT_UDPATE_STRUCTURE_COMMAND);
}
RKGlobals::rInterface ()->issueCommand (command, chain);
diff --git a/rkward/misc/rkxmlguipreviewarea.cpp b/rkward/misc/rkxmlguipreviewarea.cpp
index 6c326d84..58508aa1 100644
--- a/rkward/misc/rkxmlguipreviewarea.cpp
+++ b/rkward/misc/rkxmlguipreviewarea.cpp
@@ -108,7 +108,7 @@ void RKXMLGUIPreviewArea::setWindow(RKMDIWindow* window) {
current = window->getPart();
insertChildClient(current);
setCentralWidget(window);
- createGUI("rkwrapper_widgetpart.rc");
+ createGUI();
menuBar()->hide();
QList<KToolBar*> tbars = toolBars();
for (int i = 0; i < tbars.size(); ++i) tbars[i]->hide();
More information about the rkward-tracker
mailing list