[education/rkward] rkward: Remove RKGlobals
Thomas Friedrichsmeier
null at kde.org
Thu Apr 14 22:14:06 BST 2022
Git commit 021094ce6733e00c21ddbe349b0a58cdec6de79b by Thomas Friedrichsmeier.
Committed on 13/04/2022 at 21:40.
Pushed by tfry into branch 'master'.
Remove RKGlobals
M +0 -1 rkward/CMakeLists.txt
M +0 -1 rkward/agents/rkeditobjectagent.cpp
M +0 -1 rkward/agents/rkloadagent.cpp
M +0 -1 rkward/agents/rkquitagent.cpp
M +0 -1 rkward/agents/rksaveagent.cpp
M +0 -1 rkward/agents/showedittextfileagent.cpp
M +0 -2 rkward/core/rcontainerobject.cpp
M +0 -1 rkward/core/renvironmentobject.cpp
M +1 -1 rkward/core/rfunctionobject.cpp
M +0 -1 rkward/core/rkmodificationtracker.cpp
M +1 -1 rkward/core/rkpseudoobjects.cpp
M +0 -1 rkward/core/rkrownames.cpp
M +1 -2 rkward/core/rkvariable.cpp
M +0 -1 rkward/core/robject.cpp
M +0 -2 rkward/core/robjectlist.cpp
M +0 -1 rkward/dataeditor/rkeditordataframe.cpp
M +0 -1 rkward/dataeditor/rkvareditmodel.cpp
M +1 -1 rkward/dialogs/rkerrordialog.cpp
M +1 -1 rkward/dialogs/rksetupwizard.cpp
M +1 -0 rkward/misc/CMakeLists.txt
M +0 -1 rkward/misc/editformatdialog.cpp
M +0 -1 rkward/misc/rkobjectlistview.cpp
M +0 -1 rkward/misc/rkoutputdirectory.cpp
M +0 -1 rkward/misc/rkprogresscontrol.cpp
A +18 -0 rkward/misc/rkstyle.cpp [License: GPL(v2.0+)]
A +23 -0 rkward/misc/rkstyle.h [License: GPL(v2.0+)]
M +0 -1 rkward/misc/rkxmlguipreviewarea.cpp
M +0 -1 rkward/plugin/rkcheckbox.cpp
M +0 -1 rkward/plugin/rkcomponentmap.cpp
M +1 -1 rkward/plugin/rkcomponentproperties.cpp
M +0 -1 rkward/plugin/rkdropdown.cpp
M +0 -1 rkward/plugin/rkformula.cpp
M +1 -1 rkward/plugin/rkinput.cpp
M +3 -3 rkward/plugin/rkmatrixinput.cpp
M +1 -1 rkward/plugin/rkpluginbrowser.cpp
M +2 -2 rkward/plugin/rkpluginframe.cpp
M +1 -1 rkward/plugin/rkpluginsaveobject.cpp
M +1 -1 rkward/plugin/rkpluginspinbox.cpp
M +0 -1 rkward/plugin/rkpreviewbox.cpp
M +0 -1 rkward/plugin/rkradio.cpp
M +0 -2 rkward/plugin/rkstandardcomponent.cpp
M +3 -2 rkward/plugin/rkstandardcomponentgui.cpp
M +0 -1 rkward/plugin/rktabpage.cpp
M +0 -1 rkward/plugin/rktext.cpp
M +0 -1 rkward/plugin/rkvalueselector.cpp
M +0 -1 rkward/plugin/rkvarselector.cpp
M +0 -1 rkward/plugin/rkvarslot.cpp
M +1 -1 rkward/rbackend/rcommand.cpp
M +0 -1 rkward/rbackend/rcommandreceiver.cpp
M +0 -1 rkward/rbackend/rkrbackend.cpp
M +0 -2 rkward/rbackend/rkrinterface.cpp
M +2 -2 rkward/rbackend/rkrinterface.h
M +1 -1 rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
M +1 -1 rkward/rkconsole.cpp
D +0 -21 rkward/rkglobals.cpp
D +0 -35 rkward/rkglobals.h
M +1 -1 rkward/rkward.cpp
M +1 -1 rkward/robjectviewer.cpp
M +0 -1 rkward/scriptbackends/rkcomponentscripting.cpp
M +5 -4 rkward/settings/rksettingsmodulecommandeditor.cpp
M +3 -3 rkward/settings/rksettingsmoduleconsole.cpp
M +3 -2 rkward/settings/rksettingsmoduledebug.cpp
M +8 -8 rkward/settings/rksettingsmodulegeneral.cpp
M +2 -2 rkward/settings/rksettingsmodulegraphics.cpp
M +0 -1 rkward/settings/rksettingsmoduleobjectbrowser.cpp
M +3 -3 rkward/settings/rksettingsmoduleoutput.cpp
M +3 -3 rkward/settings/rksettingsmoduleplugins.cpp
M +4 -3 rkward/settings/rksettingsmoduler.cpp
M +2 -2 rkward/settings/rksettingsmodulewatch.cpp
M +1 -1 rkward/windows/detachedwindowcontainer.cpp
M +0 -1 rkward/windows/rcontrolwindow.cpp
M +0 -1 rkward/windows/rkcommandeditorwindow.cpp
M +0 -1 rkward/windows/rkcommandlog.cpp
M +0 -1 rkward/windows/rkfilebrowser.cpp
M +1 -1 rkward/windows/rkhelpsearchwindow.cpp
M +0 -1 rkward/windows/rkhtmlwindow.cpp
M +0 -1 rkward/windows/rktoplevelwindowgui.cpp
M +1 -1 rkward/windows/rkwindowcatcher.cpp
M +0 -1 rkward/windows/rkworkplace.cpp
M +0 -1 rkward/windows/robjectbrowser.cpp
https://invent.kde.org/education/rkward/commit/021094ce6733e00c21ddbe349b0a58cdec6de79b
diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index 109b2a44..0a3819bf 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -32,7 +32,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
SET(RKWard_Sources
rkward.cpp
main.cpp
- rkglobals.cpp
robjectviewer.cpp
rkconsole.cpp
)
diff --git a/rkward/agents/rkeditobjectagent.cpp b/rkward/agents/rkeditobjectagent.cpp
index 784aae19..908ae723 100644
--- a/rkward/agents/rkeditobjectagent.cpp
+++ b/rkward/agents/rkeditobjectagent.cpp
@@ -9,7 +9,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
#include <kmessagebox.h>
-#include "../rkglobals.h"
#include "../core/robjectlist.h"
#include "../rbackend/rkrinterface.h"
#include "../rkward.h"
diff --git a/rkward/agents/rkloadagent.cpp b/rkward/agents/rkloadagent.cpp
index 91bdb11a..7e62d5ce 100644
--- a/rkward/agents/rkloadagent.cpp
+++ b/rkward/agents/rkloadagent.cpp
@@ -15,7 +15,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <qstring.h>
#include <QTemporaryFile>
-#include "../rkglobals.h"
#include "../core/robjectlist.h"
#include "../misc/rkoutputdirectory.h"
#include "../rbackend/rkrinterface.h"
diff --git a/rkward/agents/rkquitagent.cpp b/rkward/agents/rkquitagent.cpp
index c7d01a13..9aa29d67 100644
--- a/rkward/agents/rkquitagent.cpp
+++ b/rkward/agents/rkquitagent.cpp
@@ -11,7 +11,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <qtimer.h>
-#include "../rkglobals.h"
#include "../rbackend/rkrinterface.h"
#include "../rkward.h"
#include "../misc/rkprogresscontrol.h"
diff --git a/rkward/agents/rksaveagent.cpp b/rkward/agents/rksaveagent.cpp
index b84b23ab..ff7b278e 100644
--- a/rkward/agents/rksaveagent.cpp
+++ b/rkward/agents/rksaveagent.cpp
@@ -15,7 +15,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../rbackend/rkrinterface.h"
#include "../misc/rkprogresscontrol.h"
#include "../core/robjectlist.h"
-#include "../rkglobals.h"
#include "../rkward.h"
#include "../settings/rksettingsmodulegeneral.h"
#include "../windows/rkworkplace.h"
diff --git a/rkward/agents/showedittextfileagent.cpp b/rkward/agents/showedittextfileagent.cpp
index 274e0be0..512395de 100644
--- a/rkward/agents/showedittextfileagent.cpp
+++ b/rkward/agents/showedittextfileagent.cpp
@@ -14,7 +14,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../rbackend/rkrinterface.h"
#include "../rbackend/rkrbackendprotocol_frontend.h"
#include "../windows/rkworkplace.h"
-#include "../rkglobals.h"
#include "../rkward.h"
#include "../debug.h"
diff --git a/rkward/core/rcontainerobject.cpp b/rkward/core/rcontainerobject.cpp
index e851d731..6e5e15d0 100644
--- a/rkward/core/rcontainerobject.cpp
+++ b/rkward/core/rcontainerobject.cpp
@@ -15,8 +15,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "rfunctionobject.h"
#include "renvironmentobject.h"
#include "rkrownames.h"
-
-#include "../rkglobals.h"
#include "rkmodificationtracker.h"
#include "../debug.h"
diff --git a/rkward/core/renvironmentobject.cpp b/rkward/core/renvironmentobject.cpp
index 5b50e514..c308931f 100644
--- a/rkward/core/renvironmentobject.cpp
+++ b/rkward/core/renvironmentobject.cpp
@@ -15,7 +15,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../rbackend/rkrinterface.h"
#include "../settings/rksettingsmoduleobjectbrowser.h"
#include "rkmodificationtracker.h"
-#include "../rkglobals.h"
#include "../debug.h"
diff --git a/rkward/core/rfunctionobject.cpp b/rkward/core/rfunctionobject.cpp
index 53447eba..9c685e75 100644
--- a/rkward/core/rfunctionobject.cpp
+++ b/rkward/core/rfunctionobject.cpp
@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../rbackend/rdata.h"
#include "rkmodificationtracker.h"
-#include "../rkglobals.h"
+
#include "../debug.h"
RFunctionObject::RFunctionObject (RObject *parent, const QString &name) : RObject (parent, name) {
diff --git a/rkward/core/rkmodificationtracker.cpp b/rkward/core/rkmodificationtracker.cpp
index 0ce03375..869c4c35 100644
--- a/rkward/core/rkmodificationtracker.cpp
+++ b/rkward/core/rkmodificationtracker.cpp
@@ -9,7 +9,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <kmessagebox.h>
#include <KLocalizedString>
-#include "../rkglobals.h"
#include "../dataeditor/rkeditor.h"
#include "../dataeditor/rkvareditmodel.h"
#include "rcontainerobject.h"
diff --git a/rkward/core/rkpseudoobjects.cpp b/rkward/core/rkpseudoobjects.cpp
index 71ec1aaf..4ea73136 100644
--- a/rkward/core/rkpseudoobjects.cpp
+++ b/rkward/core/rkpseudoobjects.cpp
@@ -66,7 +66,7 @@ QString RKNamespaceObject::makeChildName (const QString& short_child_name, bool,
#include "robjectlist.h"
#include "rkmodificationtracker.h"
-#include "../rkglobals.h"
+
RKOrphanNamespacesObject::RKOrphanNamespacesObject (RObjectList* parent) : REnvironmentObject (parent, i18nc ("Note: 'namespace' is a technical term, should not be translated", "Orphan Namespaces")) {
RK_TRACE (OBJECTS);
diff --git a/rkward/core/rkrownames.cpp b/rkward/core/rkrownames.cpp
index 53f52612..4b0c95a1 100644
--- a/rkward/core/rkrownames.cpp
+++ b/rkward/core/rkrownames.cpp
@@ -12,7 +12,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
#include "rcontainerobject.h"
-#include "../rkglobals.h"
#include "../rbackend/rkrinterface.h"
#include "rkmodificationtracker.h"
diff --git a/rkward/core/rkvariable.cpp b/rkward/core/rkvariable.cpp
index 7a68d944..21872648 100644
--- a/rkward/core/rkvariable.cpp
+++ b/rkward/core/rkvariable.cpp
@@ -12,9 +12,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "rcontainerobject.h"
#include "robjectlist.h"
-
#include "../rbackend/rkrinterface.h"
-#include "../rkglobals.h"
+
#include "rkmodificationtracker.h"
#define GET_DATA_COMMAND 11
diff --git a/rkward/core/robject.cpp b/rkward/core/robject.cpp
index 0a44a33d..028b8d7b 100644
--- a/rkward/core/robject.cpp
+++ b/rkward/core/robject.cpp
@@ -13,7 +13,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../rbackend/rkrinterface.h"
#include "../rbackend/rkrbackendprotocol_shared.h"
-#include "../rkglobals.h"
#include "robjectlist.h"
#include "rcontainerobject.h"
#include "rkpseudoobjects.h"
diff --git a/rkward/core/robjectlist.cpp b/rkward/core/robjectlist.cpp
index bdad2c81..4a91c69a 100644
--- a/rkward/core/robjectlist.cpp
+++ b/rkward/core/robjectlist.cpp
@@ -23,8 +23,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../settings/rksettingsmoduler.h"
#include "rkpseudoobjects.h"
-#include "../rkglobals.h"
-
#include "../debug.h"
// static
diff --git a/rkward/dataeditor/rkeditordataframe.cpp b/rkward/dataeditor/rkeditordataframe.cpp
index 8bd9a356..fdc74982 100644
--- a/rkward/dataeditor/rkeditordataframe.cpp
+++ b/rkward/dataeditor/rkeditordataframe.cpp
@@ -10,7 +10,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
#include "../rbackend/rkrinterface.h"
-#include "../rkglobals.h"
#include "twintable.h"
#include "twintablemember.h"
#include "rkvareditmodel.h"
diff --git a/rkward/dataeditor/rkvareditmodel.cpp b/rkward/dataeditor/rkvareditmodel.cpp
index 0c1600cd..52c83b76 100644
--- a/rkward/dataeditor/rkvareditmodel.cpp
+++ b/rkward/dataeditor/rkvareditmodel.cpp
@@ -17,7 +17,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../core/rkmodificationtracker.h"
#include "../core/rkrownames.h"
#include "../rbackend/rkrinterface.h"
-#include "../rkglobals.h"
#include "../debug.h"
diff --git a/rkward/dialogs/rkerrordialog.cpp b/rkward/dialogs/rkerrordialog.cpp
index 5a874be7..3fb593a2 100644
--- a/rkward/dialogs/rkerrordialog.cpp
+++ b/rkward/dialogs/rkerrordialog.cpp
@@ -26,7 +26,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkprogresscontrol.h"
#include "../misc/rkdialogbuttonbox.h"
#include "../misc/rkcommonfunctions.h"
-#include "../rkglobals.h"
+
#include "../rkward.h"
#include "../version.h"
diff --git a/rkward/dialogs/rksetupwizard.cpp b/rkward/dialogs/rksetupwizard.cpp
index fd4b0303..29f68277 100644
--- a/rkward/dialogs/rksetupwizard.cpp
+++ b/rkward/dialogs/rksetupwizard.cpp
@@ -31,7 +31,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../windows/katepluginintegration.h"
#include "../rbackend/rksessionvars.h"
#include "../rbackend/rkrinterface.h"
-#include "../rkglobals.h"
+
#include "../rkward.h"
#include "../debug.h"
diff --git a/rkward/misc/CMakeLists.txt b/rkward/misc/CMakeLists.txt
index 7863abbd..55309b54 100644
--- a/rkward/misc/CMakeLists.txt
+++ b/rkward/misc/CMakeLists.txt
@@ -28,6 +28,7 @@ SET(misc_STAT_SRCS
rkxmlguipreviewarea.cpp
rkdialogbuttonbox.cpp
rkoutputdirectory.cpp
+ rkstyle.cpp
)
ADD_LIBRARY(misc STATIC ${misc_STAT_SRCS})
diff --git a/rkward/misc/editformatdialog.cpp b/rkward/misc/editformatdialog.cpp
index 1c22e70e..ea17b36d 100644
--- a/rkward/misc/editformatdialog.cpp
+++ b/rkward/misc/editformatdialog.cpp
@@ -19,7 +19,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
#include "../core/rkvariable.h"
-#include "../rkglobals.h"
#include "../misc/rkdialogbuttonbox.h"
#include "../debug.h"
diff --git a/rkward/misc/rkobjectlistview.cpp b/rkward/misc/rkobjectlistview.cpp
index c5febf14..b30890be 100644
--- a/rkward/misc/rkobjectlistview.cpp
+++ b/rkward/misc/rkobjectlistview.cpp
@@ -19,7 +19,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QCheckBox>
#include <QComboBox>
-#include "../rkglobals.h"
#include "../core/robjectlist.h"
#include "../core/renvironmentobject.h"
#include "../core/rkmodificationtracker.h"
diff --git a/rkward/misc/rkoutputdirectory.cpp b/rkward/misc/rkoutputdirectory.cpp
index e7973ecf..14eb64a3 100644
--- a/rkward/misc/rkoutputdirectory.cpp
+++ b/rkward/misc/rkoutputdirectory.cpp
@@ -23,7 +23,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../windows/rkworkplace.h"
#include "../misc/rkcommonfunctions.h"
#include "../agents/rkquitagent.h"
-#include "../rkglobals.h"
#include "../rkward.h"
#include "../debug.h"
diff --git a/rkward/misc/rkprogresscontrol.cpp b/rkward/misc/rkprogresscontrol.cpp
index 85cc4985..f12d33d2 100644
--- a/rkward/misc/rkprogresscontrol.cpp
+++ b/rkward/misc/rkprogresscontrol.cpp
@@ -18,7 +18,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
#include <KColorScheme>
-#include "../rkglobals.h"
#include "../rbackend/rkrinterface.h"
#include "../settings/rksettingsmoduler.h"
#include "../misc/rkcommonfunctions.h"
diff --git a/rkward/misc/rkstyle.cpp b/rkward/misc/rkstyle.cpp
new file mode 100644
index 00000000..ea66405d
--- /dev/null
+++ b/rkward/misc/rkstyle.cpp
@@ -0,0 +1,18 @@
+/*
+rkstyle - This file is part of the RKWard project. Created: Wed Apr 13 2022
+SPDX-FileCopyrightText: 2022 by Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>
+SPDX-FileContributor: The RKWard Team <rkward-devel at kde.org>
+SPDX-License-Identifier: GPL-2.0-or-later
+*/
+#include "rkstyle.h"
+
+#include <QApplication>
+#include <QStyle>
+
+int RKStyle::marginHint() {
+ return QApplication::style()->pixelMetric(QStyle::PM_DefaultChildMargin);
+}
+
+int RKStyle::spacingHint() {
+ return QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing);
+}
diff --git a/rkward/misc/rkstyle.h b/rkward/misc/rkstyle.h
new file mode 100644
index 00000000..63c8a95c
--- /dev/null
+++ b/rkward/misc/rkstyle.h
@@ -0,0 +1,23 @@
+/*
+rkstyle - This file is part of the RKWard project. Created: Wed Apr 13 2022
+SPDX-FileCopyrightText: 2022 by Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>
+SPDX-FileContributor: The RKWard Team <rkward-devel at kde.org>
+SPDX-License-Identifier: GPL-2.0-or-later
+*/
+#ifndef RKSTYLE_H
+#define RKSTYLE_H
+
+/**
+Namespace to hold common styling options: Spacing and color scheme.
+
+ at author Thomas Friedrichsmeier
+*/
+class RKStyle{
+public:
+/// returns KDialog::marginHint (), without the need to include kdialog.h in all the sources
+ static int marginHint ();
+/// returns KDialog::spacingHint (), without the need to include kdialog.h in all the sources
+ static int spacingHint ();
+};
+
+#endif
diff --git a/rkward/misc/rkxmlguipreviewarea.cpp b/rkward/misc/rkxmlguipreviewarea.cpp
index 3d9eb7e3..bab6e844 100644
--- a/rkward/misc/rkxmlguipreviewarea.cpp
+++ b/rkward/misc/rkxmlguipreviewarea.cpp
@@ -23,7 +23,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../windows/rkworkplace.h"
#include "../rbackend/rcommand.h"
#include "../rbackend/rkrinterface.h"
-#include "../rkglobals.h"
#include "rkstandardicons.h"
#include "../debug.h"
diff --git a/rkward/plugin/rkcheckbox.cpp b/rkward/plugin/rkcheckbox.cpp
index 9751c259..b7c9b8cb 100644
--- a/rkward/plugin/rkcheckbox.cpp
+++ b/rkward/plugin/rkcheckbox.cpp
@@ -10,7 +10,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QVBoxLayout>
#include <KLocalizedString>
-#include "../rkglobals.h"
#include "../misc/xmlhelper.h"
#include "../debug.h"
diff --git a/rkward/plugin/rkcomponentmap.cpp b/rkward/plugin/rkcomponentmap.cpp
index e9d1de01..b4e015b4 100644
--- a/rkward/plugin/rkcomponentmap.cpp
+++ b/rkward/plugin/rkcomponentmap.cpp
@@ -23,7 +23,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/xmlhelper.h"
#include "../misc/rkcommonfunctions.h"
#include "../debug.h"
-#include "../rkglobals.h"
#include "../rkward.h"
#include "../settings/rksettingsmoduleplugins.h"
#include "../rbackend/rksessionvars.h"
diff --git a/rkward/plugin/rkcomponentproperties.cpp b/rkward/plugin/rkcomponentproperties.cpp
index e5b1915c..824df7d1 100644
--- a/rkward/plugin/rkcomponentproperties.cpp
+++ b/rkward/plugin/rkcomponentproperties.cpp
@@ -778,7 +778,7 @@ void RKComponentPropertyDouble::internalSetValue (const QString &new_value) {
///////////////////////////////////////////////// RObjects ////////////////////////////////////////////////////////
-#include "../rkglobals.h"
+
#include "../core/robjectlist.h"
#include "../core/rkvariable.h"
#include "../core/rcontainerobject.h"
diff --git a/rkward/plugin/rkdropdown.cpp b/rkward/plugin/rkdropdown.cpp
index 750e4a16..9aff9d8f 100644
--- a/rkward/plugin/rkdropdown.cpp
+++ b/rkward/plugin/rkdropdown.cpp
@@ -15,7 +15,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
-#include "../rkglobals.h"
#include "../misc/xmlhelper.h"
#include "../debug.h"
diff --git a/rkward/plugin/rkformula.cpp b/rkward/plugin/rkformula.cpp
index a296d334..797ebf94 100644
--- a/rkward/plugin/rkformula.cpp
+++ b/rkward/plugin/rkformula.cpp
@@ -22,7 +22,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../core/rcontainerobject.h"
#include "../misc/xmlhelper.h"
#include "../misc/rkstandardicons.h"
-#include "../rkglobals.h"
#include "../debug.h"
diff --git a/rkward/plugin/rkinput.cpp b/rkward/plugin/rkinput.cpp
index d6d34f1c..0779cda2 100644
--- a/rkward/plugin/rkinput.cpp
+++ b/rkward/plugin/rkinput.cpp
@@ -16,7 +16,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
#include "../misc/xmlhelper.h"
-#include "../rkglobals.h"
+
#include "../debug.h"
RKInput::RKInput (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget) : RKComponent (parent_component, parent_widget) {
diff --git a/rkward/plugin/rkmatrixinput.cpp b/rkward/plugin/rkmatrixinput.cpp
index e20bc372..4f680b79 100644
--- a/rkward/plugin/rkmatrixinput.cpp
+++ b/rkward/plugin/rkmatrixinput.cpp
@@ -11,11 +11,11 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QLabel>
#include <QHeaderView>
+#include <KLocalizedString>
+#include <KStandardAction>
+
#include "../misc/rktableview.h"
#include "../dataeditor/rktextmatrix.h"
-#include "kstandardaction.h"
-#include "KLocalizedString"
-
#include "../misc/xmlhelper.h"
#include "../debug.h"
diff --git a/rkward/plugin/rkpluginbrowser.cpp b/rkward/plugin/rkpluginbrowser.cpp
index cbc807ef..f16d5bec 100644
--- a/rkward/plugin/rkpluginbrowser.cpp
+++ b/rkward/plugin/rkpluginbrowser.cpp
@@ -16,7 +16,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/xmlhelper.h"
#include "../misc/getfilenamewidget.h"
-#include "../rkglobals.h"
+
#include "../debug.h"
RKPluginBrowser::RKPluginBrowser (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget) : RKComponent (parent_component, parent_widget) {
diff --git a/rkward/plugin/rkpluginframe.cpp b/rkward/plugin/rkpluginframe.cpp
index b30f05a8..12fbeaa7 100644
--- a/rkward/plugin/rkpluginframe.cpp
+++ b/rkward/plugin/rkpluginframe.cpp
@@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QVBoxLayout>
#include <QGroupBox>
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
#include "../misc/xmlhelper.h"
#include "../debug.h"
@@ -25,7 +25,7 @@ RKPluginFrame::RKPluginFrame (const QDomElement &element, RKComponent *parent_co
layout->addWidget (frame);
QVBoxLayout *inner = new QVBoxLayout (frame);
- inner->setSpacing (RKGlobals::spacingHint ());
+ inner->setSpacing(RKStyle::spacingHint());
checked = 0;
if (xml->getBoolAttribute (element, "checkable", false, DL_INFO)) {
diff --git a/rkward/plugin/rkpluginsaveobject.cpp b/rkward/plugin/rkpluginsaveobject.cpp
index be6667ee..1587824e 100644
--- a/rkward/plugin/rkpluginsaveobject.cpp
+++ b/rkward/plugin/rkpluginsaveobject.cpp
@@ -14,7 +14,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/xmlhelper.h"
#include "../misc/rksaveobjectchooser.h"
-#include "../rkglobals.h"
+
#include "../debug.h"
RKPluginSaveObject::RKPluginSaveObject (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget) : RKComponent (parent_component, parent_widget) {
diff --git a/rkward/plugin/rkpluginspinbox.cpp b/rkward/plugin/rkpluginspinbox.cpp
index e965e7bc..98b713ae 100644
--- a/rkward/plugin/rkpluginspinbox.cpp
+++ b/rkward/plugin/rkpluginspinbox.cpp
@@ -13,7 +13,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkspinbox.h"
#include "../misc/xmlhelper.h"
-#include "../rkglobals.h"
+
#include "../debug.h"
RKPluginSpinBox::RKPluginSpinBox (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget) : RKComponent (parent_component, parent_widget) {
diff --git a/rkward/plugin/rkpreviewbox.cpp b/rkward/plugin/rkpreviewbox.cpp
index c76a394d..3d7d6ba5 100644
--- a/rkward/plugin/rkpreviewbox.cpp
+++ b/rkward/plugin/rkpreviewbox.cpp
@@ -14,7 +14,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
-#include "../rkglobals.h"
#include "../rbackend/rkrinterface.h"
#include "../misc/xmlhelper.h"
#include "../misc/rkxmlguipreviewarea.h"
diff --git a/rkward/plugin/rkradio.cpp b/rkward/plugin/rkradio.cpp
index 7fb2e1c8..2f88269f 100644
--- a/rkward/plugin/rkradio.cpp
+++ b/rkward/plugin/rkradio.cpp
@@ -16,7 +16,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
-#include "../rkglobals.h"
#include "../misc/xmlhelper.h"
#include "../debug.h"
diff --git a/rkward/plugin/rkstandardcomponent.cpp b/rkward/plugin/rkstandardcomponent.cpp
index f321dcd3..9db294f9 100644
--- a/rkward/plugin/rkstandardcomponent.cpp
+++ b/rkward/plugin/rkstandardcomponent.cpp
@@ -47,8 +47,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "rkoptionset.h"
#include "rkvalueselector.h"
-#include "../rkglobals.h"
-
#include "../debug.h"
diff --git a/rkward/plugin/rkstandardcomponentgui.cpp b/rkward/plugin/rkstandardcomponentgui.cpp
index ac3e0a32..1389f0e6 100644
--- a/rkward/plugin/rkstandardcomponentgui.cpp
+++ b/rkward/plugin/rkstandardcomponentgui.cpp
@@ -25,12 +25,13 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkcommonfunctions.h"
#include "../misc/rkstandardicons.h"
#include "../misc/rkxmlguipreviewarea.h"
+#include "../misc/rkstyle.h"
#include "../windows/rkworkplace.h"
#include "../windows/rkcommandeditorwindow.h"
#include "../rbackend/rkrinterface.h"
#include "../rkward.h"
#include "../settings/rksettingsmoduleplugins.h"
-#include "../rkglobals.h"
+
#include "../debug.h"
class RKExtensionSplitter : public QSplitter {
@@ -178,7 +179,7 @@ void RKStandardComponentGUI::createDialog (bool switchable) {
QVBoxLayout* vbox = new QVBoxLayout ();
hbox->addLayout (vbox);
vbox->setContentsMargins (0, 0, 0, 0);
- vbox->setSpacing (RKGlobals::spacingHint ());
+ vbox->setSpacing (RKStyle::spacingHint ());
ok_button = new QPushButton (i18n ("Submit"), central_widget);
connect (ok_button, &QPushButton::clicked, this, &RKStandardComponentGUI::ok);
vbox->addWidget (ok_button);
diff --git a/rkward/plugin/rktabpage.cpp b/rkward/plugin/rktabpage.cpp
index 63f2ae04..6dd3117c 100644
--- a/rkward/plugin/rktabpage.cpp
+++ b/rkward/plugin/rktabpage.cpp
@@ -11,7 +11,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <qtabwidget.h>
#include <QVBoxLayout>
-#include "../rkglobals.h"
#include "../misc/xmlhelper.h"
#include "../debug.h"
diff --git a/rkward/plugin/rktext.cpp b/rkward/plugin/rktext.cpp
index 8f93689a..bb57ff04 100644
--- a/rkward/plugin/rktext.cpp
+++ b/rkward/plugin/rktext.cpp
@@ -13,7 +13,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <qdom.h>
#include <QVBoxLayout>
-#include "../rkglobals.h"
#include "../misc/xmlhelper.h"
#include "../misc/rkcommonfunctions.h"
#include "../debug.h"
diff --git a/rkward/plugin/rkvalueselector.cpp b/rkward/plugin/rkvalueselector.cpp
index 679d6609..51a09d82 100644
--- a/rkward/plugin/rkvalueselector.cpp
+++ b/rkward/plugin/rkvalueselector.cpp
@@ -13,7 +13,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QStringListModel>
#include "../misc/xmlhelper.h"
-#include "../rkglobals.h"
#include "../debug.h"
diff --git a/rkward/plugin/rkvarselector.cpp b/rkward/plugin/rkvarselector.cpp
index 970d991c..ba0c782e 100644
--- a/rkward/plugin/rkvarselector.cpp
+++ b/rkward/plugin/rkvarselector.cpp
@@ -17,7 +17,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
#include "../misc/xmlhelper.h"
-#include "../rkglobals.h"
#include "../misc/rkobjectlistview.h"
#include "../misc/rkstandardicons.h"
#include "../misc/rkcommonfunctions.h"
diff --git a/rkward/plugin/rkvarslot.cpp b/rkward/plugin/rkvarslot.cpp
index d1dc74f0..7c02aa4e 100644
--- a/rkward/plugin/rkvarslot.cpp
+++ b/rkward/plugin/rkvarslot.cpp
@@ -21,7 +21,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "rkvarselector.h"
#include "../core/robject.h"
-#include "../rkglobals.h"
#include "../debug.h"
#include "../misc/xmlhelper.h"
#include "../misc/rkstandardicons.h"
diff --git a/rkward/rbackend/rcommand.cpp b/rkward/rbackend/rcommand.cpp
index 70e07c4f..2c205958 100644
--- a/rkward/rbackend/rcommand.cpp
+++ b/rkward/rbackend/rcommand.cpp
@@ -13,7 +13,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../core/robject.h"
#include "../debug.h"
-#include "../rkglobals.h"
+
RCommand* RCommandChain::toCommand() {
return (is_command ? static_cast<RCommand*> (this) : 0);
diff --git a/rkward/rbackend/rcommandreceiver.cpp b/rkward/rbackend/rcommandreceiver.cpp
index 32c2673d..949a1f0a 100644
--- a/rkward/rbackend/rcommandreceiver.cpp
+++ b/rkward/rbackend/rcommandreceiver.cpp
@@ -6,7 +6,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "rcommandreceiver.h"
-#include "../rkglobals.h"
#include "rkrinterface.h"
#include "../debug.h"
diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index e871640b..2f28b7d6 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -32,7 +32,6 @@ void* RKRBackend::default_global_context = 0;
#include "../core/robject.h"
#include "../version.h"
#include "../debug.h"
-
#include "rkrsupport.h"
#include "rkstructuregetter.h"
#include "rksignalsupport.h"
diff --git a/rkward/rbackend/rkrinterface.cpp b/rkward/rbackend/rkrinterface.cpp
index 106b2bcc..575e24b3 100644
--- a/rkward/rbackend/rkrinterface.cpp
+++ b/rkward/rbackend/rkrinterface.cpp
@@ -36,10 +36,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkmessagecatalog.h"
#include "../misc/rkoutputdirectory.h"
#include "rksessionvars.h"
-
#include "../windows/rkwindowcatcher.h"
-#include "../rkglobals.h"
#include "../version.h"
#include "../debug.h"
diff --git a/rkward/rbackend/rkrinterface.h b/rkward/rbackend/rkrinterface.h
index a1b48371..2f413cdd 100644
--- a/rkward/rbackend/rkrinterface.h
+++ b/rkward/rbackend/rkrinterface.h
@@ -161,7 +161,7 @@ happens (whether the command runs successfully, or what the output is). For this
code:
\code
-#include "rkglobals.h"
+
#include "rbackend/rinterface.h"
RInterface::issueCommand ("print (\"hello world!\")", RCommand::User);
@@ -186,7 +186,7 @@ want to handle the results of RCommands from RCommandReceiver. When finished, th
The corresponding code would look something like this:
\code
-#include "rkglobals.h"
+
#include "rbackend/rinterface.h"
#include "rbackend/rcommandreceiver.h"
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
index b8d3eaa3..5adf015e 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
@@ -16,7 +16,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "rkgraphicsdevice_protocol_shared.h"
#include "../rkrinterface.h"
-#include "../../rkglobals.h"
+
#include "../../misc/rkdialogbuttonbox.h"
#include "../../debug.h"
diff --git a/rkward/rkconsole.cpp b/rkward/rkconsole.cpp
index f2d3aae6..acc3f13d 100644
--- a/rkward/rkconsole.cpp
+++ b/rkward/rkconsole.cpp
@@ -41,7 +41,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KJobWidgets>
#include <KJobUiDelegate>
-#include "rkglobals.h"
+
#include "rkward.h"
#include "windows/rkhelpsearchwindow.h"
#include "windows/rkcodecompletion.h"
diff --git a/rkward/rkglobals.cpp b/rkward/rkglobals.cpp
deleted file mode 100644
index 46f8e920..00000000
--- a/rkward/rkglobals.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-rkglobals - This file is part of RKWard (https://rkward.kde.org). Created: Wed Aug 18 2004
-SPDX-FileCopyrightText: 2004 by Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>
-SPDX-FileContributor: The RKWard Team <rkward-devel at kde.org>
-SPDX-License-Identifier: GPL-2.0-or-later
-*/
-#include "rkglobals.h"
-
-#include <qstring.h>
-
-#include <QApplication>
-#include <QStyle>
-
-int RKGlobals::marginHint () {
- return QApplication::style ()->pixelMetric (QStyle::PM_DefaultChildMargin);
-}
-
-int RKGlobals::spacingHint () {
- return QApplication::style ()->pixelMetric (QStyle::PM_DefaultLayoutSpacing);
-}
-
diff --git a/rkward/rkglobals.h b/rkward/rkglobals.h
deleted file mode 100644
index 7a2fe2b8..00000000
--- a/rkward/rkglobals.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-rkglobals - This file is part of the RKWard project. Created: Wed Aug 18 2004
-SPDX-FileCopyrightText: 2004-2013 by Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>
-SPDX-FileContributor: The RKWard Team <rkward-devel at kde.org>
-SPDX-License-Identifier: GPL-2.0-or-later
-*/
-#ifndef RKGLOBALS_H
-#define RKGLOBALS_H
-
-#include <QVariantMap>
-
-class RKWardMainWindow;
-class RInterface;
-class RObjectList;
-class RKModificationTracker;
-class KHelpDlg;
-class RControlWindow;
-class QString;
-
-/**
-This class basically keeps some static pointers which are needed all over the place, so they won't have to be passed around.
-
-TODO: move the static members to the respective classes instead. There's no point in having them here, and having to include rkglobals.h all over the place.
-
- at author Thomas Friedrichsmeier
-*/
-class RKGlobals{
-public:
-/// returns KDialog::marginHint (), without the need to include kdialog.h in all the sources
- static int marginHint ();
-/// returns KDialog::spacingHint (), without the need to include kdialog.h in all the sources
- static int spacingHint ();
-};
-
-#endif
diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
index 5b3b5887..f50d2c12 100644
--- a/rkward/rkward.cpp
+++ b/rkward/rkward.cpp
@@ -55,7 +55,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "misc/rkxmlguisyncer.h"
#include "misc/rkdbusapi.h"
#include "misc/rkdialogbuttonbox.h"
-#include "rkglobals.h"
+
#include "dialogs/startupdialog.h"
#include "dialogs/rkloadlibsdialog.h"
#include "dialogs/rkimportdialog.h"
diff --git a/rkward/robjectviewer.cpp b/rkward/robjectviewer.cpp
index 44ac6102..996264a4 100644
--- a/rkward/robjectviewer.cpp
+++ b/rkward/robjectviewer.cpp
@@ -18,7 +18,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QFontDatabase>
#include "rbackend/rkrinterface.h"
-#include "rkglobals.h"
+
#include "core/robject.h"
#include "misc/rkdummypart.h"
#include "../misc/rkcommonfunctions.h"
diff --git a/rkward/scriptbackends/rkcomponentscripting.cpp b/rkward/scriptbackends/rkcomponentscripting.cpp
index d51ae268..0342e71e 100644
--- a/rkward/scriptbackends/rkcomponentscripting.cpp
+++ b/rkward/scriptbackends/rkcomponentscripting.cpp
@@ -15,7 +15,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../core/robjectlist.h"
#include "../misc/rkcommonfunctions.h"
#include "../misc/xmlhelper.h"
-#include "../rkglobals.h"
#include "../rbackend/rkrinterface.h"
#include "qtscriptbackend.h"
#include "qtscripti18n.h"
diff --git a/rkward/settings/rksettingsmodulecommandeditor.cpp b/rkward/settings/rksettingsmodulecommandeditor.cpp
index 5d9d6c5a..6597071e 100644
--- a/rkward/settings/rksettingsmodulecommandeditor.cpp
+++ b/rkward/settings/rksettingsmodulecommandeditor.cpp
@@ -25,7 +25,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkcommonfunctions.h"
#include "../misc/rkstandardicons.h"
#include "../core/robject.h"
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
+
#include "../debug.h"
// static members
@@ -115,11 +116,11 @@ RKSettingsModuleCommandEditor::RKSettingsModuleCommandEditor (RKSettings *gui, Q
QVBoxLayout* main_vbox = new QVBoxLayout (this);
main_vbox->addWidget (RKCommonFunctions::wordWrappedLabel (i18n ("Settings marked with (*) do not take effect until you restart RKWard")));
- main_vbox->addSpacing (2 * RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2 * RKStyle::spacingHint ());
main_vbox->addWidget (completion_settings_widget = new RKCodeCompletionSettingsWidget (this, this, &completion_settings, true));
- main_vbox->addSpacing (2 * RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2 * RKStyle::spacingHint ());
QGroupBox *group = autosave_enabled_box = new QGroupBox (i18n ("Autosaves"), this);
autosave_enabled_box->setCheckable (true);
@@ -133,7 +134,7 @@ RKSettingsModuleCommandEditor::RKSettingsModuleCommandEditor (RKSettings *gui, Q
main_vbox->addWidget (group);
- main_vbox->addSpacing (2 * RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2 * RKStyle::spacingHint ());
group = new QGroupBox (i18n ("Opening script files"), this);
form_layout = new QFormLayout (group);
diff --git a/rkward/settings/rksettingsmoduleconsole.cpp b/rkward/settings/rksettingsmoduleconsole.cpp
index 41a6dbad..1fdab236 100644
--- a/rkward/settings/rksettingsmoduleconsole.cpp
+++ b/rkward/settings/rksettingsmoduleconsole.cpp
@@ -19,7 +19,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../rbackend/rcommand.h"
#include "../misc/rkspinbox.h"
#include "../misc/rkstandardicons.h"
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
#include "../debug.h"
@@ -52,7 +52,7 @@ RKSettingsModuleConsole::RKSettingsModuleConsole (RKSettings *gui, QWidget *pare
auto max_console_lines_spinner = max_console_lines.makeSpinBox(0, 10000, this);
vbox->addWidget (max_console_lines_spinner);
- vbox->addSpacing (2*RKGlobals::spacingHint ());
+ vbox->addSpacing (2*RKStyle::spacingHint ());
auto pipe_user_commands_through_console_box = pipe_user_commands_through_console.makeCheckbox(i18n("Run commands from script editor through console"), this);
vbox->addWidget(pipe_user_commands_through_console_box);
@@ -65,7 +65,7 @@ RKSettingsModuleConsole::RKSettingsModuleConsole (RKSettings *gui, QWidget *pare
connect(pipe_user_commands_through_console_box, &QCheckBox::stateChanged, add_piped_commands_to_history_box, &QCheckBox::setEnabled);
vbox->addWidget (add_piped_commands_to_history_box);
- vbox->addSpacing (2*RKGlobals::spacingHint ());
+ vbox->addSpacing (2*RKStyle::spacingHint ());
vbox->addWidget (context_sensitive_history_by_default.makeCheckbox(i18n("Command history is context sensitive by default"), this));
diff --git a/rkward/settings/rksettingsmoduledebug.cpp b/rkward/settings/rksettingsmoduledebug.cpp
index 9c523e96..2fa5832f 100644
--- a/rkward/settings/rksettingsmoduledebug.cpp
+++ b/rkward/settings/rksettingsmoduledebug.cpp
@@ -20,7 +20,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkspinbox.h"
#include "../misc/rkcommonfunctions.h"
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
+
#include "../debug.h"
RKSettingsModuleDebug::RKSettingsModuleDebug (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
@@ -30,7 +31,7 @@ RKSettingsModuleDebug::RKSettingsModuleDebug (RKSettings *gui, QWidget *parent)
main_vbox->addWidget (RKCommonFunctions::wordWrappedLabel (i18n ("<b>These settings are for debugging purposes, only.</b> It is safe to leave them untouched. Also, these settings will only apply to the current session, and will not be saved.")));
- main_vbox->addSpacing (2 * RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2 * RKStyle::spacingHint ());
QLabel* label = new QLabel (i18n ("Debug level"), this);
debug_level_box = new RKSpinBox (this);
diff --git a/rkward/settings/rksettingsmodulegeneral.cpp b/rkward/settings/rksettingsmodulegeneral.cpp
index e9a96c81..b450501e 100644
--- a/rkward/settings/rksettingsmodulegeneral.cpp
+++ b/rkward/settings/rksettingsmodulegeneral.cpp
@@ -9,7 +9,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <KLocalizedString>
#include <KSharedConfig>
#include <KConfigGroup>
-
#include <qlayout.h>
#include <qlabel.h>
#include <qdir.h>
@@ -24,7 +23,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkspinbox.h"
#include "../misc/rkcommonfunctions.h"
#include "../misc/rkstandardicons.h"
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
+
#include "../version.h"
#include "../debug.h"
@@ -60,13 +60,13 @@ RKSettingsModuleGeneral::RKSettingsModuleGeneral (RKSettings *gui, QWidget *pare
QVBoxLayout *main_vbox = new QVBoxLayout (this);
main_vbox->addWidget (RKCommonFunctions::wordWrappedLabel (i18n ("Settings marked with (*) do not take effect until you restart RKWard")));
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
files_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingDirectory, true, i18n ("Directory where rkward may store files (*)"), QString (), new_files_path);
connect (files_choser, &GetFileNameWidget::locationChanged, this, &RKSettingsModuleGeneral::change);
main_vbox->addWidget (files_choser);
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
main_vbox->addWidget(new QLabel(i18n("Startup Action (*)")));
auto startup_action_choser = startup_action.makeDropDown(RKConfigBase::LabelList(
@@ -90,7 +90,7 @@ RKSettingsModuleGeneral::RKSettingsModuleGeneral (RKSettings *gui, QWidget *pare
RKCommonFunctions::setTips (i18n ("<p>The initial working directory to use. Note that if you are loading a workspace on startup, and you have configured RKWard to change to the directory of loaded workspaces, that directory will take precedence.</p>"), group_box, initial_dir_chooser, initial_dir_custom_chooser);
main_vbox->addWidget (group_box);
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
main_vbox->addWidget (RKCommonFunctions::wordWrappedLabel (i18n ("The workplace layout (i.e. which script-, data-, help-windows are open) may be saved (and loaded) per R workspace, or independent of the R workspace. Which do you prefer?")));
@@ -112,16 +112,16 @@ RKSettingsModuleGeneral::RKSettingsModuleGeneral (RKSettings *gui, QWidget *pare
connect (workplace_save_chooser, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this, &RKSettingsModuleGeneral::change);
main_vbox->addWidget (group_box);
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
main_vbox->addWidget(cd_to_workspace_dir_on_load.makeCheckbox(i18n("When loading a workspace, change to the corresponding directory."), this));
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
main_vbox->addWidget (new QLabel(i18n("Warn when editing objects with more than this number of fields (0 for no limit):")));
main_vbox->addWidget (warn_size_object_edit.makeSpinBox(0, INT_MAX, this));
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
main_vbox->addWidget(new QLabel(i18n("MDI window focus behavior"), this));
auto mdi_focus_policy_chooser = mdi_focus_policy.makeDropDown(RKConfigBase::LabelList(
diff --git a/rkward/settings/rksettingsmodulegraphics.cpp b/rkward/settings/rksettingsmodulegraphics.cpp
index a8a45c96..bc235b04 100644
--- a/rkward/settings/rksettingsmodulegraphics.cpp
+++ b/rkward/settings/rksettingsmodulegraphics.cpp
@@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QRadioButton>
#include <QSpinBox>
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
#include "../rbackend/rkrinterface.h"
#include "../misc/rkspinbox.h"
#include "../misc/rkcommonfunctions.h"
@@ -105,7 +105,7 @@ RKSettingsModuleGraphics::RKSettingsModuleGraphics (RKSettings *gui, QWidget *pa
group_layout = new QVBoxLayout(group);
group_layout->addWidget(new QLabel(i18n("Default width (inches):")));
group_layout->addWidget(graphics_width.makeSpinBox(1, 100.0, this));
- group_layout->addSpacing(2*RKGlobals::spacingHint());
+ group_layout->addSpacing(2*RKStyle::spacingHint());
group_layout->addWidget(new QLabel(i18n("Default height (inches)")));
group_layout->addWidget(graphics_height.makeSpinBox(1, 100.0, this));
main_vbox->addWidget (group);
diff --git a/rkward/settings/rksettingsmoduleobjectbrowser.cpp b/rkward/settings/rksettingsmoduleobjectbrowser.cpp
index 6a625767..80e09d7d 100644
--- a/rkward/settings/rksettingsmoduleobjectbrowser.cpp
+++ b/rkward/settings/rksettingsmoduleobjectbrowser.cpp
@@ -17,7 +17,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QVBoxLayout>
#include <QInputDialog>
-#include "../rkglobals.h"
#include "../misc/multistringselector.h"
#include "../misc/rkstandardicons.h"
#include "rksettings.h"
diff --git a/rkward/settings/rksettingsmoduleoutput.cpp b/rkward/settings/rksettingsmoduleoutput.cpp
index c073809a..24a8a185 100644
--- a/rkward/settings/rksettingsmoduleoutput.cpp
+++ b/rkward/settings/rksettingsmoduleoutput.cpp
@@ -17,7 +17,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QVBoxLayout>
#include <QComboBox>
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
#include "../misc/getfilenamewidget.h"
#include "../misc/rkcommonfunctions.h"
#include "../misc/rkspinbox.h"
@@ -147,7 +147,7 @@ RKSettingsModuleOutput::RKSettingsModuleOutput (RKSettings *gui, QWidget *parent
graphics_type_box->setCurrentIndex (graphics_type_box->findData (graphics_type.get()));
graphics_type_box->setEditable (false);
connect (graphics_type_box, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &RKSettingsModuleOutput::boxChanged);
- h_layout->addSpacing (2*RKGlobals::spacingHint ());
+ h_layout->addSpacing (2*RKStyle::spacingHint ());
h_layout->addWidget (new QLabel (i18n ("JPG quality"), group));
h_layout->addWidget (graphics_jpg_quality_box = graphics_jpg_quality.makeSpinBox(1, 100, this));
graphics_jpg_quality_box->setEnabled (graphics_type == "\"JPG\"");
@@ -157,7 +157,7 @@ RKSettingsModuleOutput::RKSettingsModuleOutput (RKSettings *gui, QWidget *parent
group_layout->addLayout (h_layout);
h_layout->addWidget (new QLabel (i18n ("Width:"), group));
h_layout->addWidget (graphics_width.makeSpinBox(1, INT_MAX, this));
- h_layout->addSpacing (2*RKGlobals::spacingHint ());
+ h_layout->addSpacing (2*RKStyle::spacingHint ());
h_layout->addWidget (new QLabel (i18n ("Height:"), group));
h_layout->addWidget (graphics_height.makeSpinBox(1, INT_MAX, this));
h_layout->addStretch ();
diff --git a/rkward/settings/rksettingsmoduleplugins.cpp b/rkward/settings/rksettingsmoduleplugins.cpp
index 36404cc3..7d1d036b 100644
--- a/rkward/settings/rksettingsmoduleplugins.cpp
+++ b/rkward/settings/rksettingsmoduleplugins.cpp
@@ -23,7 +23,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QIcon>
#include "../rkward.h"
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
#include "../misc/multistringselector.h"
#include "../misc/rkcommonfunctions.h"
#include "../misc/rkspinbox.h"
@@ -46,7 +46,7 @@ RKSettingsModulePlugins::RKSettingsModulePlugins (RKSettings *gui, QWidget *pare
QVBoxLayout *main_vbox = new QVBoxLayout (this);
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
main_vbox->addWidget (RKCommonFunctions::wordWrappedLabel (i18n ("Some plugins are available with both, a wizard-like interface and a traditional dialog interface. If both are available, which mode of presentation do you prefer?")));
@@ -70,7 +70,7 @@ RKSettingsModulePlugins::RKSettingsModulePlugins (RKSettings *gui, QWidget *pare
connect (button_group, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this, &RKSettingsModulePlugins::settingChanged);
main_vbox->addWidget (button_box);
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
QPushButton *pluginmap_config_button = new QPushButton (i18n ("Configure Active Plugins"), this);
connect (pluginmap_config_button, &QPushButton::clicked, this, &RKSettingsModulePlugins::configurePluginmaps);
diff --git a/rkward/settings/rksettingsmoduler.cpp b/rkward/settings/rksettingsmoduler.cpp
index 934b4708..d93b5b2e 100755
--- a/rkward/settings/rksettingsmoduler.cpp
+++ b/rkward/settings/rksettingsmoduler.cpp
@@ -33,7 +33,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkstandardicons.h"
#include "../rbackend/rkrinterface.h"
#include "../rbackend/rksessionvars.h"
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
+
#include "../debug.h"
// static constants
@@ -61,7 +62,7 @@ RKSettingsModuleR::RKSettingsModuleR (RKSettings *gui, QWidget *parent) : RKSett
QVBoxLayout *main_vbox = new QVBoxLayout (this);
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
main_vbox->addWidget (RKCommonFunctions::wordWrappedLabel (i18n ("The following settings mostly affect R behavior in the console. It is generally safe to keep these unchanged.")));
@@ -313,7 +314,7 @@ RKSettingsModuleRPackages::RKSettingsModuleRPackages (RKSettings *gui, QWidget *
QVBoxLayout *main_vbox = new QVBoxLayout (this);
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+ main_vbox->addSpacing (2*RKStyle::spacingHint ());
main_vbox->addWidget (new QLabel (i18n ("CRAN download mirror (leave empty to be prompted once each session):"), this));
QHBoxLayout* hbox = new QHBoxLayout ();
diff --git a/rkward/settings/rksettingsmodulewatch.cpp b/rkward/settings/rksettingsmodulewatch.cpp
index 0849759e..d4352202 100644
--- a/rkward/settings/rksettingsmodulewatch.cpp
+++ b/rkward/settings/rksettingsmodulewatch.cpp
@@ -21,7 +21,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkspinbox.h"
#include "../misc/rkstandardicons.h"
#include "rksettings.h"
-#include "../rkglobals.h"
+#include "../misc/rkstyle.h"
#include "../debug.h"
@@ -134,7 +134,7 @@ RKSettingsModuleWatch::RKSettingsModuleWatch (RKSettings *gui, QWidget *parent)
app_filter_boxes = addFilterSettings (this, grid, 3, i18n ("Application commands"), app_filter);
sync_filter_boxes = addFilterSettings (this, grid, 4, i18n ("Synchronization commands"), sync_filter);
- vbox->addSpacing (2*RKGlobals::spacingHint ());
+ vbox->addSpacing (2*RKStyle::spacingHint ());
vbox->addWidget(new QLabel(i18n("Maximum number of paragraphs/lines to display in the Command Log (0 for no limit)")));
vbox->addWidget(max_log_lines.makeSpinBox(0, INT_MAX, this));
diff --git a/rkward/windows/detachedwindowcontainer.cpp b/rkward/windows/detachedwindowcontainer.cpp
index 1dd73a2e..69781a1e 100644
--- a/rkward/windows/detachedwindowcontainer.cpp
+++ b/rkward/windows/detachedwindowcontainer.cpp
@@ -23,7 +23,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkstandardicons.h"
#include "../misc/rkxmlguisyncer.h"
#include "rkworkplace.h"
-#include "../rkglobals.h"
+
#include "../debug.h"
/* Warning! Do not pass a parent widget to the KParts::MainWindow. Otherwise there will be strange crahes while removing the KXMLGUIClients! (In this case: Open a help window, and detach it. Open another help window attached. Close the detached one, then close the attached one -> crash; KDE 3.5.5) */
diff --git a/rkward/windows/rcontrolwindow.cpp b/rkward/windows/rcontrolwindow.cpp
index 12926061..2e21e24b 100644
--- a/rkward/windows/rcontrolwindow.cpp
+++ b/rkward/windows/rcontrolwindow.cpp
@@ -20,7 +20,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../rbackend/rkrinterface.h"
#include "../rbackend/rcommand.h"
#include "../rbackend/rcommandstack.h"
-#include "../rkglobals.h"
#include "../rkward.h"
#include "../debug.h"
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index 49f2a33e..44ce9ad2 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -51,7 +51,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../settings/rksettings.h"
#include "../settings/rksettingsmodulecommandeditor.h"
#include "../rkconsole.h"
-#include "../rkglobals.h"
#include "../rkward.h"
#include "rkhelpsearchwindow.h"
#include "rkhtmlwindow.h"
diff --git a/rkward/windows/rkcommandlog.cpp b/rkward/windows/rkcommandlog.cpp
index 4cc4bcad..18fada68 100644
--- a/rkward/windows/rkcommandlog.cpp
+++ b/rkward/windows/rkcommandlog.cpp
@@ -8,7 +8,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "rkcommandlog.h"
#include "../rbackend/rkrinterface.h"
-#include "../rkglobals.h"
#include "../rkconsole.h"
#include "../settings/rksettingsmodulewatch.h"
#include "../misc/rkstandardactions.h"
diff --git a/rkward/windows/rkfilebrowser.cpp b/rkward/windows/rkfilebrowser.cpp
index 19eb64de..45733b86 100644
--- a/rkward/windows/rkfilebrowser.cpp
+++ b/rkward/windows/rkfilebrowser.cpp
@@ -29,7 +29,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QInputDialog>
#include "rkworkplace.h"
-#include "../rkglobals.h"
#include "../rbackend/rkrinterface.h"
#include "../rkward.h"
#include "../misc/rkdummypart.h"
diff --git a/rkward/windows/rkhelpsearchwindow.cpp b/rkward/windows/rkhelpsearchwindow.cpp
index 410ba229..16882837 100644
--- a/rkward/windows/rkhelpsearchwindow.cpp
+++ b/rkward/windows/rkhelpsearchwindow.cpp
@@ -27,7 +27,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../rbackend/rcommandreceiver.h"
#include "../rbackend/rksessionvars.h"
#include "../debug.h"
-#include "../rkglobals.h"
+
#include "../rkward.h"
#include "../core/robject.h"
#include "../misc/rkcommonfunctions.h"
diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.cpp
index 89138975..988bf4bc 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -35,7 +35,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <QCheckBox>
#include <QFileDialog>
-#include "../rkglobals.h"
#include "../rbackend/rkrinterface.h"
#include "rkhelpsearchwindow.h"
#include "../rkward.h"
diff --git a/rkward/windows/rktoplevelwindowgui.cpp b/rkward/windows/rktoplevelwindowgui.cpp
index e597796b..69810d5d 100644
--- a/rkward/windows/rktoplevelwindowgui.cpp
+++ b/rkward/windows/rktoplevelwindowgui.cpp
@@ -41,7 +41,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../plugin/rkcomponentmap.h"
#include "../dialogs/rkerrordialog.h"
#include "../rbackend/rkrinterface.h"
-#include "../rkglobals.h"
#include "../rkward.h"
#include "../debug.h"
diff --git a/rkward/windows/rkwindowcatcher.cpp b/rkward/windows/rkwindowcatcher.cpp
index 41eb6b50..ba2a5e50 100644
--- a/rkward/windows/rkwindowcatcher.cpp
+++ b/rkward/windows/rkwindowcatcher.cpp
@@ -212,7 +212,7 @@ void RKWindowCatcher::killDevice (int device_number) {
#include <kselectaction.h>
#include <kactioncollection.h>
-#include "../rkglobals.h"
+
#include "../rbackend/rkrinterface.h"
#include "../rbackend/rkwarddevice/rkgraphicsdevice.h"
#include "../core/robject.h"
diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp
index bcb98558..082b222a 100644
--- a/rkward/windows/rkworkplace.cpp
+++ b/rkward/windows/rkworkplace.cpp
@@ -46,7 +46,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../misc/rkcommonfunctions.h"
#include "../misc/rkoutputdirectory.h"
#include "../misc/rkxmlguipreviewarea.h"
-#include "../rkglobals.h"
#include "../rkward.h"
#include "../debug.h"
diff --git a/rkward/windows/robjectbrowser.cpp b/rkward/windows/robjectbrowser.cpp
index 16f543ef..79e3a3e2 100644
--- a/rkward/windows/robjectbrowser.cpp
+++ b/rkward/windows/robjectbrowser.cpp
@@ -18,7 +18,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../rkward.h"
#include "rkhelpsearchwindow.h"
-#include "../rkglobals.h"
#include "../core/robjectlist.h"
#include "../core/renvironmentobject.h"
#include "../core/rkmodificationtracker.h"
More information about the rkward-tracker
mailing list