[education/rkward] /: Update clang-format version
Thomas Friedrichsmeier
null at kde.org
Sun Aug 24 16:08:55 BST 2025
Git commit d6c26d21f640687966f980f892eb80bf42498439 by Thomas Friedrichsmeier.
Committed on 24/08/2025 at 15:06.
Pushed by tfry into branch 'master'.
Update clang-format version
M +2 -2 .gitlab-ci.yml
M +2 -2 rkward/core/rcontainerobject.h
M +1 -1 rkward/core/rkrownames.h
M +1 -1 rkward/core/robject.h
M +1 -1 rkward/core/robjectlist.h
M +2 -2 rkward/dataeditor/rkvareditmodel.h
M +1 -1 rkward/dialogs/rkloadlibsdialog.h
M +1 -1 rkward/dialogs/rkselectlistdialog.cpp
M +3 -3 rkward/dialogs/rksetupwizard.h
M +2 -2 rkward/misc/multistringselector.cpp
M +1 -1 rkward/misc/rkcommandlineargs.h
M +1 -1 rkward/misc/rkmessagecatalog.h
M +2 -2 rkward/misc/rkoutputdirectory.h
M +4 -4 rkward/misc/rkparsedscript.h
M +1 -1 rkward/misc/rkparsedversion.h
M +1 -1 rkward/misc/rkradiogroup.cpp
M +1 -1 rkward/misc/rkxmlguipreviewarea.cpp
M +3 -3 rkward/misc/rkxmlguisyncer_p.h
M +1 -1 rkward/plugin/rkcomponent.h
M +3 -3 rkward/plugin/rkcomponentmap.h
M +1 -1 rkward/plugin/rkcomponentmeta.h
M +1 -1 rkward/plugin/rkoptionset.h
M +3 -3 rkward/rbackend/rcommand.h
M +1 -1 rkward/rbackend/rkasyncdatastreamhelper.h
M +2 -1 rkward/rbackend/rkrbackendprotocol_backend.cpp
M +2 -1 rkward/rbackend/rkrbackendprotocol_backend.h
M +1 -1 rkward/rbackend/rkrbackendprotocol_shared.h
M +1 -1 rkward/rbackend/rkrinterface.cpp
M +1 -1 rkward/rbackend/rkrsupport.h
M +5 -5 rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
M +1 -1 rkward/rbackend/rkwarddevice/rkgraphicsdevice.h
M +1 -1 rkward/rkconsole.cpp
M +5 -5 rkward/robjectviewer.h
M +2 -2 rkward/scriptbackends/qtscripti18n.h
M +8 -8 rkward/settings/rksettingsmodule.h
M +3 -3 rkward/settings/rksettingsmodulecommandeditor.h
M +1 -1 rkward/settings/rksettingsmodulegeneral.cpp
M +1 -1 rkward/settings/rksettingsmoduleplugins.cpp
M +1 -1 rkward/settings/rksettingsmoduleplugins.h
M +1 -1 rkward/windows/katepluginintegration.h
M +1 -1 rkward/windows/rkcodecompletion.cpp
M +1 -1 rkward/windows/rkcodenavigation.cpp
M +21 -12 rkward/windows/rkcommandeditorwindow.cpp
M +2 -2 rkward/windows/rkcommandeditorwindow.h
M +1 -1 rkward/windows/rkhtmlwindow.cpp
M +2 -2 rkward/windows/rkhtmlwindow.h
https://invent.kde.org/education/rkward/-/commit/d6c26d21f640687966f980f892eb80bf42498439
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff7281c0e..9903983f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,7 +71,7 @@ clang_format:
- master
before_script:
- apt-get update
- - apt-get install --yes --no-install-recommends git clang-format-14
+ - apt-get install --yes --no-install-recommends git clang-format-19
script:
- - find rkward \( -name "*.cpp" -or -name "*.h" -or -name "*.js" \) -exec clang-format-14 -i {} \;
+ - find rkward \( -name "*.cpp" -or -name "*.h" -or -name "*.js" \) -exec clang-format-19 -i {} \;
- git diff --exit-code
diff --git a/rkward/core/rcontainerobject.h b/rkward/core/rcontainerobject.h
index 9794d383f..1564a193b 100644
--- a/rkward/core/rcontainerobject.h
+++ b/rkward/core/rcontainerobject.h
@@ -52,9 +52,9 @@ class RContainerObject : public RObject {
void moveChild(RObject *child, int from_index, int to_index);
/** reimplemented from RObject to do nothing at all, including not raising an assert. This is because container objects do not have any edit data, themselves, but may be opened for editing, e.g. as a data.frame */
- void beginEdit() override{};
+ void beginEdit() override {};
/** see beginEdit() */
- void endEdit() override{};
+ void endEdit() override {};
/** return an RKVariable representing the row-names object for this container */
RKRowNames *rowNames();
diff --git a/rkward/core/rkrownames.h b/rkward/core/rkrownames.h
index 94f9055d3..54c688417 100644
--- a/rkward/core/rkrownames.h
+++ b/rkward/core/rkrownames.h
@@ -19,7 +19,7 @@ class RKRowNames : public RKVariable {
QString getFullName(int) const override;
/** Reimplemented to do nothing. There is no metadata on the rownames. */
- void writeMetaData(RCommandChain *) override{};
+ void writeMetaData(RCommandChain *) override {};
/** Reimplemented to always try to write data as numbers, if possible */
void writeData(int from_row, int to_row, RCommandChain *chain = nullptr) override;
diff --git a/rkward/core/robject.h b/rkward/core/robject.h
index f698f4ea0..b7cfa16d6 100644
--- a/rkward/core/robject.h
+++ b/rkward/core/robject.h
@@ -222,7 +222,7 @@ class RObject {
/** Representation of changes to an edited object (currently for vector data, only) */
struct ChangeSet {
- ChangeSet(int from = -1, int to = -1, bool reset = false) : from_index(from), to_index(to), full_reset(reset){};
+ ChangeSet(int from = -1, int to = -1, bool reset = false) : from_index(from), to_index(to), full_reset(reset) {};
int from_index; /**< first changed index */
int to_index; /**< last changed index */
bool full_reset; /**< Model should do a full reset (e.g. dimensions may have changed) */
diff --git a/rkward/core/robjectlist.h b/rkward/core/robjectlist.h
index d57bd1ac0..18df9033d 100644
--- a/rkward/core/robjectlist.h
+++ b/rkward/core/robjectlist.h
@@ -44,7 +44,7 @@ class RObjectList : public QObject, public RContainerObject {
QString getFullName(int) const override { return QString(); };
QString makeChildName(const QString &short_child_name, int) const override { return short_child_name; };
/** reimplemented from RContainerObject: do nothing. The object-list has no meta data. */
- void writeMetaData(RCommandChain *) override{};
+ void writeMetaData(RCommandChain *) override {};
REnvironmentObject *findPackage(const QString &namespacename) const;
diff --git a/rkward/dataeditor/rkvareditmodel.h b/rkward/dataeditor/rkvareditmodel.h
index 1a86a60b8..a6874af85 100644
--- a/rkward/dataeditor/rkvareditmodel.h
+++ b/rkward/dataeditor/rkvareditmodel.h
@@ -25,8 +25,8 @@ class RKRowNames;
@author Thomas Friedrichsmeier */
class RKVarEditModelBase : public QAbstractTableModel {
public:
- explicit RKVarEditModelBase(QObject *parent) : QAbstractTableModel(parent), var_col_offset(0){};
- virtual ~RKVarEditModelBase(){};
+ explicit RKVarEditModelBase(QObject *parent) : QAbstractTableModel(parent), var_col_offset(0) {};
+ virtual ~RKVarEditModelBase() {};
virtual RKTextMatrix getTextMatrix(const QItemSelectionRange &range) const = 0;
virtual void blankRange(const QItemSelectionRange &range) = 0;
diff --git a/rkward/dialogs/rkloadlibsdialog.h b/rkward/dialogs/rkloadlibsdialog.h
index d6455fb3a..90169a75b 100644
--- a/rkward/dialogs/rkloadlibsdialog.h
+++ b/rkward/dialogs/rkloadlibsdialog.h
@@ -34,7 +34,7 @@ class QLabel;
class RKLoadLibsDialogPage : public QWidget {
Q_OBJECT
public:
- RKLoadLibsDialogPage(QWidget *parent) : QWidget(parent), _changed(false){};
+ RKLoadLibsDialogPage(QWidget *parent) : QWidget(parent), _changed(false) {};
virtual void apply() = 0;
virtual void activated() = 0;
bool isChanged() const { return _changed; };
diff --git a/rkward/dialogs/rkselectlistdialog.cpp b/rkward/dialogs/rkselectlistdialog.cpp
index 548c0197c..cd11d7ff1 100644
--- a/rkward/dialogs/rkselectlistdialog.cpp
+++ b/rkward/dialogs/rkselectlistdialog.cpp
@@ -22,7 +22,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
/** A QListWidget with a sane sizeHint() */
class RKSelectListDialogListWidget : public QListWidget {
public:
- explicit RKSelectListDialogListWidget(QWidget *parent) : QListWidget(parent){};
+ explicit RKSelectListDialogListWidget(QWidget *parent) : QListWidget(parent) {};
QSize sizeHint() const override {
return (QSize(qMax(50, sizeHintForColumn(0) + verticalScrollBar()->width()), qMax(50, sizeHintForRow(0) * (count() + 1))));
}
diff --git a/rkward/dialogs/rksetupwizard.h b/rkward/dialogs/rksetupwizard.h
index 095722ed8..076b1d77a 100644
--- a/rkward/dialogs/rksetupwizard.h
+++ b/rkward/dialogs/rksetupwizard.h
@@ -60,8 +60,8 @@ class RKSetupWizardItem {
Warning,
Good
};
- explicit RKSetupWizardItem(const QString &shortlabel, const QString &longlabel = QString(), Status status = Good, const QString &shortstatuslabel = QString()) : status(status), shortlabel(shortlabel), longlabel(longlabel), shortstatuslabel(shortstatuslabel), box(nullptr){};
- ~RKSetupWizardItem(){};
+ explicit RKSetupWizardItem(const QString &shortlabel, const QString &longlabel = QString(), Status status = Good, const QString &shortstatuslabel = QString()) : status(status), shortlabel(shortlabel), longlabel(longlabel), shortstatuslabel(shortstatuslabel), box(nullptr) {};
+ ~RKSetupWizardItem() {};
void addOption(const QString &shortlabel, const QString &longlabel, std::function<void(RKSetupWizard *)> callback) {
options.append(Option(shortlabel, longlabel, callback));
}
@@ -79,7 +79,7 @@ class RKSetupWizardItem {
void apply(RKSetupWizard *wizard);
struct Option {
- Option(const QString &shortlabel, const QString &longlabel, std::function<void(RKSetupWizard *)> callback) : shortlabel(shortlabel), longlabel(longlabel), callback(callback){};
+ Option(const QString &shortlabel, const QString &longlabel, std::function<void(RKSetupWizard *)> callback) : shortlabel(shortlabel), longlabel(longlabel), callback(callback) {};
QString shortlabel;
QString longlabel;
std::function<void(RKSetupWizard *)> callback;
diff --git a/rkward/misc/multistringselector.cpp b/rkward/misc/multistringselector.cpp
index d969cc00a..2123eb6a6 100644
--- a/rkward/misc/multistringselector.cpp
+++ b/rkward/misc/multistringselector.cpp
@@ -21,8 +21,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
class RKStringListModelWithColumnLabel : public QStringListModel {
public:
- RKStringListModelWithColumnLabel(QObject *parent, const QString &_label) : QStringListModel(parent), label(_label){};
- ~RKStringListModelWithColumnLabel(){};
+ RKStringListModelWithColumnLabel(QObject *parent, const QString &_label) : QStringListModel(parent), label(_label) {};
+ ~RKStringListModelWithColumnLabel() {};
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override {
if ((section == 0) && (orientation == Qt::Horizontal) && (role == Qt::DisplayRole)) return label;
return QVariant();
diff --git a/rkward/misc/rkcommandlineargs.h b/rkward/misc/rkcommandlineargs.h
index 2be7dcbcf..b28cb68e2 100644
--- a/rkward/misc/rkcommandlineargs.h
+++ b/rkward/misc/rkcommandlineargs.h
@@ -19,7 +19,7 @@ class QCoreApplication;
class RKCommandLineArgs {
public:
explicit RKCommandLineArgs(KAboutData *about, QCoreApplication *app);
- ~RKCommandLineArgs(){};
+ ~RKCommandLineArgs() {};
enum Option {
UrlArgs,
Evaluate,
diff --git a/rkward/misc/rkmessagecatalog.h b/rkward/misc/rkmessagecatalog.h
index e3c37934e..5b42686c4 100644
--- a/rkward/misc/rkmessagecatalog.h
+++ b/rkward/misc/rkmessagecatalog.h
@@ -43,7 +43,7 @@ class RKMessageCatalog {
QMutex setup_mutex;
public:
- CatalogHash(){};
+ CatalogHash() {};
~CatalogHash();
RKMessageCatalog *getCatalog(const QString &name, const QString &pathhint);
};
diff --git a/rkward/misc/rkoutputdirectory.h b/rkward/misc/rkoutputdirectory.h
index c61aa6efb..92f5c443a 100644
--- a/rkward/misc/rkoutputdirectory.h
+++ b/rkward/misc/rkoutputdirectory.h
@@ -24,8 +24,8 @@ class RKOutputDirectory;
/** Convenience struct to avoid defining separate functions for R API and C++ API in RKOutputDirectory.
* This struct encapsulates the relevant results for both */
struct RKOutputDirectoryCallResult : public GenericRRequestResult {
- RKOutputDirectoryCallResult() : GenericRRequestResult(), _dir(nullptr){};
- RKOutputDirectoryCallResult(const GenericRRequestResult &other) : GenericRRequestResult(other), _dir(nullptr){};
+ RKOutputDirectoryCallResult() : GenericRRequestResult(), _dir(nullptr) {};
+ RKOutputDirectoryCallResult(const GenericRRequestResult &other) : GenericRRequestResult(other), _dir(nullptr) {};
void setDir(RKOutputDirectory *d);
RKOutputDirectory *dir() const { return _dir; }
diff --git a/rkward/misc/rkparsedscript.h b/rkward/misc/rkparsedscript.h
index 197d5bd07..03903c537 100644
--- a/rkward/misc/rkparsedscript.h
+++ b/rkward/misc/rkparsedscript.h
@@ -49,8 +49,8 @@ class RKParsedScript {
};
struct Context {
- Context(ContextType type, int start) : type(type), start(start){};
- Context(ContextType type, int start, int end) : type(type), start(start), end(end){};
+ Context(ContextType type, int start) : type(type), start(start) {};
+ Context(ContextType type, int start, int end) : type(type), start(start), end(end) {};
bool maybeNesting() const { return (type == Parenthesis || type == Brace || type == Bracket || type == Top); };
ContextType type;
int start;
@@ -67,8 +67,8 @@ class RKParsedScript {
/** Helper struct to enforce strict type checking between character position, and index of context */
struct ContextIndex {
- ContextIndex() : index(-1){};
- explicit ContextIndex(int index) : index(index){};
+ ContextIndex() : index(-1) {};
+ explicit ContextIndex(int index) : index(index) {};
bool valid() const { return index >= 0; };
bool operator==(const ContextIndex &other) const { return index == other.index; };
bool operator!=(const ContextIndex &other) const { return index != other.index; };
diff --git a/rkward/misc/rkparsedversion.h b/rkward/misc/rkparsedversion.h
index f7b323ee9..2dd8bec60 100644
--- a/rkward/misc/rkparsedversion.h
+++ b/rkward/misc/rkparsedversion.h
@@ -14,7 +14,7 @@ Anything else (everything after the fourth dot, or after the first character tha
class RKParsedVersion {
public:
explicit RKParsedVersion(const QString &from_string);
- RKParsedVersion() : version_numeric(0){};
+ RKParsedVersion() : version_numeric(0) {};
/** Create a null version that will always compare as higher than other (non-null) versions */
static RKParsedVersion maxVersion() {
RKParsedVersion ret;
diff --git a/rkward/misc/rkradiogroup.cpp b/rkward/misc/rkradiogroup.cpp
index 3f249672c..c9041216c 100644
--- a/rkward/misc/rkradiogroup.cpp
+++ b/rkward/misc/rkradiogroup.cpp
@@ -16,7 +16,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
* automatically be removed, in case the button is deleted independent of the controlled widget. */
class RKRadioGroupButton : public QRadioButton {
public:
- explicit RKRadioGroupButton(const QString &label) : QRadioButton(label){};
+ explicit RKRadioGroupButton(const QString &label) : QRadioButton(label) {};
void control(QWidget *controlled) {
RKRadioGroupButton::controlled = controlled;
controlled->installEventFilter(this);
diff --git a/rkward/misc/rkxmlguipreviewarea.cpp b/rkward/misc/rkxmlguipreviewarea.cpp
index 9dec01c68..6987ca0b6 100644
--- a/rkward/misc/rkxmlguipreviewarea.cpp
+++ b/rkward/misc/rkxmlguipreviewarea.cpp
@@ -35,7 +35,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
class RKXMLGUIPreviewBuilder : public KXMLGUIBuilder {
public:
- RKXMLGUIPreviewBuilder(QWidget *parent, QMenuBar *menubar) : KXMLGUIBuilder(parent), menubar(menubar){};
+ RKXMLGUIPreviewBuilder(QWidget *parent, QMenuBar *menubar) : KXMLGUIBuilder(parent), menubar(menubar) {};
QStringList containerTags() const override {
QStringList ret;
ret << QStringLiteral("menubar") << QStringLiteral("menu");
diff --git a/rkward/misc/rkxmlguisyncer_p.h b/rkward/misc/rkxmlguisyncer_p.h
index ee88042c8..8bdf905b0 100644
--- a/rkward/misc/rkxmlguisyncer_p.h
+++ b/rkward/misc/rkxmlguisyncer_p.h
@@ -22,8 +22,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
class RKXMLGUISyncerNotifier : public QObject {
Q_OBJECT
public:
- explicit RKXMLGUISyncerNotifier(QObject *parent) : QObject(parent){};
- ~RKXMLGUISyncerNotifier(){};
+ explicit RKXMLGUISyncerNotifier(QObject *parent) : QObject(parent) {};
+ ~RKXMLGUISyncerNotifier() {};
void emitChangeSignal(KXMLGUIClient *client) { Q_EMIT changed(client); };
Q_SIGNALS:
@@ -40,7 +40,7 @@ class RKXMLGUISyncerPrivate : public QObject {
connect(&rebuild_guis_timer, &QTimer::timeout, this, &RKXMLGUISyncerPrivate::rebuildGUIs);
rebuild_guis_timer.setSingleShot(true);
}
- ~RKXMLGUISyncerPrivate(){};
+ ~RKXMLGUISyncerPrivate() {};
/** Internally we store the actionCollection() of each KXMLGUIClient, instead of a pointer to the client, itself. This is because KXMLGUIClient is not a QObject, and so we cannot safely detect its destruction. */
QMultiHash<QString, KActionCollection *> client_map;
diff --git a/rkward/plugin/rkcomponent.h b/rkward/plugin/rkcomponent.h
index 96b160dd0..2b9c749f9 100644
--- a/rkward/plugin/rkcomponent.h
+++ b/rkward/plugin/rkcomponent.h
@@ -26,7 +26,7 @@ class RKComponentBase {
is_internal = false;
};
/** destructor */
- virtual ~RKComponentBase(){};
+ virtual ~RKComponentBase() {};
/** enum of types of properties. Used from RTTI. Don't change the values, as there are some range checks in the code (see isProperty ()) */
enum RKComponentTypes {
PropertyBase = 1,
diff --git a/rkward/plugin/rkcomponentmap.h b/rkward/plugin/rkcomponentmap.h
index e76fdc64f..9090bae4f 100644
--- a/rkward/plugin/rkcomponentmap.h
+++ b/rkward/plugin/rkcomponentmap.h
@@ -18,7 +18,7 @@ class XMLHelper;
/** very simple helper class to keep track of .pluginmap files */
class RKPluginMapFile {
public:
- RKPluginMapFile(const QString &filename, const QString &basedir, const RKMessageCatalog *_catalog) : basedir(basedir), filename(filename), catalog(_catalog), about(nullptr){};
+ RKPluginMapFile(const QString &filename, const QString &basedir, const RKMessageCatalog *_catalog) : basedir(basedir), filename(filename), catalog(_catalog), about(nullptr) {};
~RKPluginMapFile() { delete about; };
QString getBaseDir() const { return basedir; };
@@ -157,7 +157,7 @@ class RKComponentGUIXML {
void clearGUIDescription();
/** an entry was added to the menu(s) somewhere. Reimplement, if you want to e.g. create a QAction for this */
- virtual void addedEntry(const QString & /* id */, RKComponentHandle * /* handle */){};
+ virtual void addedEntry(const QString & /* id */, RKComponentHandle * /* handle */) {};
/** The generated XML GUI description in KDEs ui.rc format */
QDomDocument gui_xml;
@@ -186,7 +186,7 @@ class RKComponentGUIXML {
class RKPluginMapParseResult {
public:
- RKPluginMapParseResult() : valid_plugins(0){};
+ RKPluginMapParseResult() : valid_plugins(0) {};
void add(const RKPluginMapParseResult &other) {
detailed_problems.append(other.detailed_problems);
valid_plugins += other.valid_plugins;
diff --git a/rkward/plugin/rkcomponentmeta.h b/rkward/plugin/rkcomponentmeta.h
index 6ec5e2ff0..f19fac323 100644
--- a/rkward/plugin/rkcomponentmeta.h
+++ b/rkward/plugin/rkcomponentmeta.h
@@ -15,7 +15,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
class XMLHelper;
struct RKComponentDependency {
- RKComponentDependency() : type(RBaseInstallation), min_version(RKParsedVersion()), max_version(RKParsedVersion::maxVersion()){};
+ RKComponentDependency() : type(RBaseInstallation), min_version(RKParsedVersion()), max_version(RKParsedVersion::maxVersion()) {};
QString toHtml() const;
static QString depsToHtml(const QList<RKComponentDependency> &deps);
enum DependencyType {
diff --git a/rkward/plugin/rkoptionset.h b/rkward/plugin/rkoptionset.h
index 900bb2cf2..03bb27c83 100644
--- a/rkward/plugin/rkoptionset.h
+++ b/rkward/plugin/rkoptionset.h
@@ -86,7 +86,7 @@ class RKOptionSet : public RKComponent {
QMap<RKComponentPropertyStringList *, ColumnInfo> column_map;
QList<RKComponentPropertyStringList *> visible_columns;
struct RowInfo {
- explicit RowInfo(PropertyValueMap initial_values) : valid(false), finished(false), full_row_map(initial_values){};
+ explicit RowInfo(PropertyValueMap initial_values) : valid(false), finished(false), full_row_map(initial_values) {};
bool valid; /**< has finished processing and is known to be valid */
bool finished; /**< has finished processing */
PropertyValueMap full_row_map; /**< complete status representation of this row, (see RKComponent::fetchPropertyValuesRecursive()) */
diff --git a/rkward/rbackend/rcommand.h b/rkward/rbackend/rcommand.h
index 0d46ca645..e509d059b 100644
--- a/rkward/rbackend/rcommand.h
+++ b/rkward/rbackend/rcommand.h
@@ -37,7 +37,7 @@ class RCommandChain {
protected:
friend class RCommandStack;
friend class RCommandStackModel;
- RCommandChain(bool is_chain = true) : closed(!is_chain), is_command(!is_chain){};
+ RCommandChain(bool is_chain = true) : closed(!is_chain), is_command(!is_chain) {};
QList<RCommandChain *> sub_commands;
bool closed;
bool is_command;
@@ -47,7 +47,7 @@ class RCommandChain {
/** this struct is used to store the R output to an RCommand. The RCommand basically keeps a list of ROutputString (s). The difference to a normal
QString is, that additionally we store information on whether the output was "normal", "warning", or an "error". */
struct ROutput {
- ROutput() : type(NoOutput){};
+ ROutput() : type(NoOutput) {};
enum ROutputType {
NoOutput, /**< No output. Rarely used. */
Output, /**< normal output */
@@ -233,7 +233,7 @@ class RCommand : public RData, public RCommandChain {
* - If @param warning is non-null, the message will be shown (as a warning), but no error will be raised.
* - Unless an error was thrown, @param ret will be returned as a basic data type (possibly NULL). */
struct GenericRRequestResult {
- GenericRRequestResult(const QVariant &ret = QVariant(), const QString &warning = QString(), const QString &error = QString()) : error(error), warning(warning), ret(ret){};
+ GenericRRequestResult(const QVariant &ret = QVariant(), const QString &warning = QString(), const QString &error = QString()) : error(error), warning(warning), ret(ret) {};
static GenericRRequestResult makeError(const QString &error) {
return GenericRRequestResult(QVariant(), QString(), error);
}
diff --git a/rkward/rbackend/rkasyncdatastreamhelper.h b/rkward/rbackend/rkasyncdatastreamhelper.h
index 826913215..4e6c245c9 100644
--- a/rkward/rbackend/rkasyncdatastreamhelper.h
+++ b/rkward/rbackend/rkasyncdatastreamhelper.h
@@ -37,7 +37,7 @@ class RKAsyncDataStreamHelper {
device = nullptr;
expected_read_size = 0;
}
- ~RKAsyncDataStreamHelper(){};
+ ~RKAsyncDataStreamHelper() {};
void setIODevice(QIODevice *_device) {
device = _device;
diff --git a/rkward/rbackend/rkrbackendprotocol_backend.cpp b/rkward/rbackend/rkrbackendprotocol_backend.cpp
index 284e33c74..3e765d733 100644
--- a/rkward/rbackend/rkrbackendprotocol_backend.cpp
+++ b/rkward/rbackend/rkrbackendprotocol_backend.cpp
@@ -65,7 +65,8 @@ extern "C"
# else
__attribute__((__visibility__("default")))
# endif
- int do_main(int argc, char *argv[], void *libr_dll_handle, void *(*dlsym_fun)(void *, const char *)) {
+ int
+ do_main(int argc, char *argv[], void *libr_dll_handle, void *(*dlsym_fun)(void *, const char *)) {
#else
int main(int argc, char *argv[]) {
#endif
diff --git a/rkward/rbackend/rkrbackendprotocol_backend.h b/rkward/rbackend/rkrbackendprotocol_backend.h
index 04f0ecc73..a2c045f38 100644
--- a/rkward/rbackend/rkrbackendprotocol_backend.h
+++ b/rkward/rbackend/rkrbackendprotocol_backend.h
@@ -19,7 +19,8 @@ extern "C"
#else
__attribute__((__visibility__("default")))
#endif
- int do_main(int, char **, void *, void *(*)(void *, const char *));
+ int
+ do_main(int, char **, void *, void *(*)(void *, const char *));
class RKRBackendProtocolBackend {
public:
diff --git a/rkward/rbackend/rkrbackendprotocol_shared.h b/rkward/rbackend/rkrbackendprotocol_shared.h
index 6123f5535..3c675f58e 100644
--- a/rkward/rbackend/rkrbackendprotocol_shared.h
+++ b/rkward/rbackend/rkrbackendprotocol_shared.h
@@ -103,7 +103,7 @@ class RKRBackendEvent : public QEvent {
RKWardEvent = QEvent::User + 1
};
explicit RKRBackendEvent(RBackendRequest *data = nullptr) : QEvent((QEvent::Type)RKWardEvent) { _data = data; };
- ~RKRBackendEvent(){};
+ ~RKRBackendEvent() {};
RBackendRequest *data() { return _data; };
diff --git a/rkward/rbackend/rkrinterface.cpp b/rkward/rbackend/rkrinterface.cpp
index 95dba41f9..ad0945071 100644
--- a/rkward/rbackend/rkrinterface.cpp
+++ b/rkward/rbackend/rkrinterface.cpp
@@ -39,9 +39,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include "../windows/rkwindowcatcher.h"
#include "../windows/rkworkplace.h"
#include "rcommandstack.h"
-#include "rkwarddevice/rkgraphicsdevice_frontendtransmitter.h"
#include "rkrbackendprotocol_frontend.h"
#include "rksessionvars.h"
+#include "rkwarddevice/rkgraphicsdevice_frontendtransmitter.h"
#include "../debug.h"
#include "../version.h"
diff --git a/rkward/rbackend/rkrsupport.h b/rkward/rbackend/rkrsupport.h
index 082bac5f7..46756f0da 100644
--- a/rkward/rbackend/rkrsupport.h
+++ b/rkward/rbackend/rkrsupport.h
@@ -63,7 +63,7 @@ class RKRShadowEnvironment {
static void updateCacheForGlobalenvSymbol(const QString &name);
private:
- RKRShadowEnvironment(SEXP baseenvir, SEXP shadowenvir) : baseenvir(baseenvir), shadowenvir(shadowenvir){};
+ RKRShadowEnvironment(SEXP baseenvir, SEXP shadowenvir) : baseenvir(baseenvir), shadowenvir(shadowenvir) {};
~RKRShadowEnvironment();
static RKRShadowEnvironment *environmentFor(SEXP baseenvir);
void updateSymbolCache(const QString &name);
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
index 49a635b80..d7f544e1e 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
@@ -32,13 +32,13 @@ QHash<int, RKGraphicsDevice *> RKGraphicsDevice::devices;
RKGraphicsDevice::RKGraphicsDevice(double width, double height, const QString &title, bool antialias, bool keep_hidden) : QObject(),
#ifdef USE_QIMAGE_BUFFER
- area(qAbs(width) + 1, qAbs(height) + 1, QImage::Format_ARGB32),
+ area(qAbs(width) + 1, qAbs(height) + 1, QImage::Format_ARGB32),
#else
- area(qAbs(width) + 1, qAbs(height) + 1),
+ area(qAbs(width) + 1, qAbs(height) + 1),
#endif
- hidden(keep_hidden),
- base_title(title),
- antialias(antialias && !keep_hidden) {
+ hidden(keep_hidden),
+ base_title(title),
+ antialias(antialias && !keep_hidden) {
RK_TRACE(GRAPHICS_DEVICE);
interaction_opcode = -1;
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.h b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.h
index ff1ad78ea..c9172cb9c 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.h
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.h
@@ -69,7 +69,7 @@ class RKGraphicsDevice : public QObject {
// graphics event handling
/** Simple struct to keep info about both mouse and keyboard events, so we can store them in a list, until R fetches them. */
struct StoredEvent {
- StoredEvent() : event_code(0), buttons(0), modifiers(0), keycode(0), x(0), y(0){};
+ StoredEvent() : event_code(0), buttons(0), modifiers(0), keycode(0), x(0), y(0) {};
qint8 event_code;
qint8 buttons;
qint32 modifiers;
diff --git a/rkward/rkconsole.cpp b/rkward/rkconsole.cpp
index 42b8e752f..80875bca7 100644
--- a/rkward/rkconsole.cpp
+++ b/rkward/rkconsole.cpp
@@ -360,7 +360,7 @@ bool RKConsole::eventFilter(QObject *o, QEvent *e) {
view->scroll (0, y - y2);
}
} */
- // not good, yet: always jumps to bottom of view
+ // not good, yet: always jumps to bottom of view
} else if (e->type() == QEvent::DragMove || e->type() == QEvent::Drop) {
QDropEvent *me = static_cast<QDropEvent *>(e); // NOTE: QDragMoveEvent inherits from QDropEvent
diff --git a/rkward/robjectviewer.h b/rkward/robjectviewer.h
index 6de21d5a6..8dbed55ae 100644
--- a/rkward/robjectviewer.h
+++ b/rkward/robjectviewer.h
@@ -96,8 +96,8 @@ class RObjectViewerWidget : public QWidget {
/** Represents the "summary" area in an RObjectViewer */
class RObjectSummaryWidget : public RObjectViewerWidget {
public:
- RObjectSummaryWidget(QWidget *parent, RObject *object) : RObjectViewerWidget(parent, object){};
- ~RObjectSummaryWidget(){};
+ RObjectSummaryWidget(QWidget *parent, RObject *object) : RObjectViewerWidget(parent, object) {};
+ ~RObjectSummaryWidget() {};
/** reimplemented from RObjectViewerWidget to call "summary" */
RCommand *makeCommand() override;
@@ -107,7 +107,7 @@ class RObjectSummaryWidget : public RObjectViewerWidget {
class RObjectPrintWidget : public RObjectViewerWidget {
public:
RObjectPrintWidget(QWidget *parent, RObject *object) : RObjectViewerWidget(parent, object) {}
- ~RObjectPrintWidget(){};
+ ~RObjectPrintWidget() {};
/** reimplemented from RObjectViewerWidget to call "print" */
RCommand *makeCommand() override;
@@ -116,8 +116,8 @@ class RObjectPrintWidget : public RObjectViewerWidget {
/** Represents the "str" area in an RObjectViewer */
class RObjectStructureWidget : public RObjectViewerWidget {
public:
- RObjectStructureWidget(QWidget *parent, RObject *object) : RObjectViewerWidget(parent, object){};
- ~RObjectStructureWidget(){};
+ RObjectStructureWidget(QWidget *parent, RObject *object) : RObjectViewerWidget(parent, object) {};
+ ~RObjectStructureWidget() {};
/** reimplemented from RObjectViewerWidget to call "str" */
RCommand *makeCommand() override;
diff --git a/rkward/scriptbackends/qtscripti18n.h b/rkward/scriptbackends/qtscripti18n.h
index 173aea36e..e62988ae4 100644
--- a/rkward/scriptbackends/qtscripti18n.h
+++ b/rkward/scriptbackends/qtscripti18n.h
@@ -18,8 +18,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
class RKMessageCatalogObject : public QObject {
Q_OBJECT
public:
- RKMessageCatalogObject(const RKMessageCatalog *_catalog, QObject *parent) : QObject(parent), catalog(_catalog){};
- virtual ~RKMessageCatalogObject(){};
+ RKMessageCatalogObject(const RKMessageCatalog *_catalog, QObject *parent) : QObject(parent), catalog(_catalog) {};
+ virtual ~RKMessageCatalogObject() {};
Q_INVOKABLE QString i18n(const QString &msgid, const QStringList &args) const {
return (catalog->translate(msgid, args));
diff --git a/rkward/settings/rksettingsmodule.h b/rkward/settings/rksettingsmodule.h
index 26dacee96..5368efe25 100644
--- a/rkward/settings/rksettingsmodule.h
+++ b/rkward/settings/rksettingsmodule.h
@@ -53,8 +53,8 @@ class RKConfigBase {
typedef QList<ValueLabel> LabelList;
protected:
- RKConfigBase(const char *name) : name(name){};
- virtual ~RKConfigBase(){};
+ RKConfigBase(const char *name) : name(name) {};
+ virtual ~RKConfigBase() {};
const char *name;
static QComboBox *makeDropDownHelper(const LabelList &entries, RKSettingsModuleWidget *module, int initial, std::function<void(int)> setter);
@@ -66,8 +66,8 @@ class RKConfigBase {
template <typename T, typename STORAGE_T = T>
class RKConfigValue : public RKConfigBase {
public:
- RKConfigValue(const char *name, const T &default_value) : RKConfigBase(name), value(default_value){};
- ~RKConfigValue(){};
+ RKConfigValue(const char *name, const T &default_value) : RKConfigBase(name), value(default_value) {};
+ ~RKConfigValue() {};
void loadConfig(KConfigGroup &cg) override {
value = (T)cg.readEntry(name, (STORAGE_T)value);
@@ -116,14 +116,14 @@ class RKConfigValue : public RKConfigBase {
class RKConfigGroup : public RKConfigBase {
public:
RKConfigGroup(const char *name, std::initializer_list<RKConfigBase *> values) : RKConfigBase(name),
- values(values){};
+ values(values) {};
template <typename T>
RKConfigGroup(const char *name, size_t count, RKConfigValue<T> *_values) : RKConfigBase(name),
values(count) {
for (size_t i = 0; i < count; ++i)
values[i] = (_values + i);
}
- ~RKConfigGroup(){};
+ ~RKConfigGroup() {};
void loadConfig(KConfigGroup &cg) override {
KConfigGroup lcg = cg;
if (name && name[0]) {
@@ -174,7 +174,7 @@ class RKSettingsModule : public QObject {
friend class RKSettings;
static RCommandChain *chain;
virtual void syncConfig(KConfig *config, RKConfigBase::ConfigSyncAction) = 0;
- virtual void validateSettingsInteractive(QList<RKSetupWizardItem *> *){};
+ virtual void validateSettingsInteractive(QList<RKSetupWizardItem *> *) {};
};
/** Base class for UI widgets operating on an RKSettingsModule. For now this is used, only where similar settings are shared across modules (e.g. code completion). Eventually, this could be used to disentangle RKSettingsModule from QWidget. */
@@ -182,7 +182,7 @@ class RKSettingsModuleWidget : public QWidget {
Q_OBJECT
public:
RKSettingsModuleWidget(QWidget *parent, RKSettingsModule *parent_module, const RKSettingsModule::PageId pageid, const RKSettingsModule::PageId superpageid = RKSettingsModule::no_page_id);
- ~RKSettingsModuleWidget(){};
+ ~RKSettingsModuleWidget() {};
virtual void applyChanges() = 0;
/** Mark this module as "changed" (propagates to parent module) */
void change();
diff --git a/rkward/settings/rksettingsmodulecommandeditor.h b/rkward/settings/rksettingsmodulecommandeditor.h
index 3ea006446..4982af765 100644
--- a/rkward/settings/rksettingsmodulecommandeditor.h
+++ b/rkward/settings/rksettingsmodulecommandeditor.h
@@ -17,8 +17,8 @@ class ConfigPage;
class RKCodeCompletionSettingsWidget;
class RKCodeCompletionSettings {
public:
- RKCodeCompletionSettings(){};
- ~RKCodeCompletionSettings(){};
+ RKCodeCompletionSettings() {};
+ ~RKCodeCompletionSettings() {};
void syncConfig(KConfigGroup &cg, RKConfigBase::ConfigSyncAction a) { group.syncConfig(cg, a); };
@@ -64,7 +64,7 @@ class RKCodeCompletionSettings {
class RKCodeCompletionSettingsWidget : public QWidget {
public:
RKCodeCompletionSettingsWidget(RKSettingsModuleWidget *parent, RKCodeCompletionSettings *settings, bool show_common);
- ~RKCodeCompletionSettingsWidget(){};
+ ~RKCodeCompletionSettingsWidget() {};
private:
void makeCompletionTypeBoxes(const QStringList &labels, QGridLayout *layout);
diff --git a/rkward/settings/rksettingsmodulegeneral.cpp b/rkward/settings/rksettingsmodulegeneral.cpp
index 716ed694e..380640e9f 100644
--- a/rkward/settings/rksettingsmodulegeneral.cpp
+++ b/rkward/settings/rksettingsmodulegeneral.cpp
@@ -128,7 +128,7 @@ class RKSettingsPageGeneral : public RKSettingsModuleWidget {
main_vbox->addStretch();
}
- ~RKSettingsPageGeneral(){};
+ ~RKSettingsPageGeneral() {};
void applyChanges() override {
RK_TRACE(SETTINGS);
RKSettingsModuleGeneral::new_files_path = files_choser->getLocation();
diff --git a/rkward/settings/rksettingsmoduleplugins.cpp b/rkward/settings/rksettingsmoduleplugins.cpp
index d8ab88973..8b69f017a 100644
--- a/rkward/settings/rksettingsmoduleplugins.cpp
+++ b/rkward/settings/rksettingsmoduleplugins.cpp
@@ -93,7 +93,7 @@ class RKSettingsHeaderPage : public RKSettingsModuleWidget {
layout->addWidget(l);
layout->addStretch();
}
- void applyChanges() override{};
+ void applyChanges() override {};
};
RKSettingsModulePlugins::RKSettingsModulePlugins(QObject *parent) : RKSettingsModule(parent) {
diff --git a/rkward/settings/rksettingsmoduleplugins.h b/rkward/settings/rksettingsmoduleplugins.h
index 15dea6462..ac8c9a070 100644
--- a/rkward/settings/rksettingsmoduleplugins.h
+++ b/rkward/settings/rksettingsmoduleplugins.h
@@ -74,7 +74,7 @@ class RKSettingsModulePlugins : public RKSettingsModule {
/** Helper struct used by RKSettingsModulePlugins to keep track of plugin map files. */
struct PluginMapStoredInfo {
- explicit PluginMapStoredInfo(const QString &_filename) : filename(_filename), state(Working){};
+ explicit PluginMapStoredInfo(const QString &_filename) : filename(_filename), state(Working) {};
QString filename;
PluginMapState state;
int priority;
diff --git a/rkward/windows/katepluginintegration.h b/rkward/windows/katepluginintegration.h
index 8e2b344c1..d3fff7ebb 100644
--- a/rkward/windows/katepluginintegration.h
+++ b/rkward/windows/katepluginintegration.h
@@ -121,7 +121,7 @@ class KatePluginIntegrationWindow : public QObject, public KXMLGUIClient {
KTextEditor::MainWindow *main;
QObject *createPluginView(KTextEditor::Plugin *plugin);
struct PluginResources {
- PluginResources() : view(nullptr){};
+ PluginResources() : view(nullptr) {};
QObject *view;
QList<KXMLGUIClient *> clients;
QList<KatePluginWindow *> windows;
diff --git a/rkward/windows/rkcodecompletion.cpp b/rkward/windows/rkcodecompletion.cpp
index 444c67c83..117396027 100644
--- a/rkward/windows/rkcodecompletion.cpp
+++ b/rkward/windows/rkcodecompletion.cpp
@@ -30,7 +30,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
class RKCompletionNotifierModel : public RKCompletionModelBase {
public:
- explicit RKCompletionNotifierModel(RKCompletionManager *manager) : RKCompletionModelBase(manager){};
+ explicit RKCompletionNotifierModel(RKCompletionManager *manager) : RKCompletionModelBase(manager) {};
KTextEditor::Range completionRange(KTextEditor::View *, const KTextEditor::Cursor &position) override {
return KTextEditor::Range(position, position);
}
diff --git a/rkward/windows/rkcodenavigation.cpp b/rkward/windows/rkcodenavigation.cpp
index d7de0e77b..2e72f51f1 100644
--- a/rkward/windows/rkcodenavigation.cpp
+++ b/rkward/windows/rkcodenavigation.cpp
@@ -37,7 +37,7 @@ class RKCodeNavigationInternal : public QObject {
view(view),
doc(view->document()),
rmdmode(doc->highlightingMode() == u"R Markdown"_s),
- ps(doc->text(), rmdmode){};
+ ps(doc->text(), rmdmode) {};
struct StoredPosition {
int pos;
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index 7d3f45e41..763b1dbb1 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -552,10 +552,9 @@ static RKCommandHighlighter::HighlightingMode documentHighlightingMode(KTextEdit
class RKPreviewMode : public QAction {
public:
- RKPreviewMode(KTextEditor::Document *doc, const QString &label, const QIcon &icon, const QString &input_ext, RKCommandHighlighter::HighlightingMode mode) :
- QAction(icon, label, doc),
- input_ext(input_ext),
- valid_mode(mode) {
+ RKPreviewMode(KTextEditor::Document *doc, const QString &label, const QIcon &icon, const QString &input_ext, RKCommandHighlighter::HighlightingMode mode) : QAction(icon, label, doc),
+ input_ext(input_ext),
+ valid_mode(mode) {
setCheckable(true);
connect(doc, &KTextEditor::Document::highlightingModeChanged, this, [this, doc] { checkApplicable(doc); });
checkApplicable(doc);
@@ -571,12 +570,15 @@ class RKPreviewMode : public QAction {
};
QString preview_label;
- std::function<QString(const QString &, const QString &, const QString &, RKPreviewMode*)> command;
- QAction* getOption(int id) const { return options.value(id); };
- QAction* addOption(int id, QAction *action) { options.insert(id, action); return action; };
+ std::function<QString(const QString &, const QString &, const QString &, RKPreviewMode *)> command;
+ QAction *getOption(int id) const { return options.value(id); };
+ QAction *addOption(int id, QAction *action) {
+ options.insert(id, action);
+ return action;
+ };
QString input_ext;
RKCommandHighlighter::HighlightingMode valid_mode;
- QMap<int, QAction*> options;
+ QMap<int, QAction *> options;
};
class RKScriptPreviewIO {
@@ -617,7 +619,7 @@ class RKScriptPreviewIO {
infile->remove();
delete infile;
}
- static RKScriptPreviewIO *init(RKScriptPreviewIO *previous, KTextEditor::Document *doc, RKPreviewMode *preview_mode) {
+ static RKScriptPreviewIO *init(RKScriptPreviewIO *previous, KTextEditor::Document *doc, RKPreviewMode *preview_mode) {
// Whenever possible, we try to reuse an existing temporary file, because
// a) If build files do spill (as happens with rmarkdown::render()), it will not be quite as many
// b) Faster in some cases
@@ -729,7 +731,9 @@ void RKCommandEditorWindow::initPreviewModes(KActionMenu *menu) {
auto m = new RKPreviewMode(m_doc, i18n("R Markdown"), QIcon::fromTheme(u"preview_math"_s), u".Rmd"_s, RKCommandHighlighter::RMarkdown);
m->preview_label = i18n("Preview of rendered R Markdown");
m->setToolTip(i18n("Preview the script as rendered from RMarkdown format (.Rmd)"));
- enum _RenderMode { HTML, PDF, Auto };
+ enum _RenderMode { HTML,
+ PDF,
+ Auto };
auto group = new QActionGroup(m);
m->addOption(HTML, new QAction(i18n("Render as HTML"), group))->setCheckable(true);
m->addOption(PDF, new QAction(i18n("Render as PDF"), group))->setCheckable(true);
@@ -759,7 +763,12 @@ void RKCommandEditorWindow::initPreviewModes(KActionMenu *menu) {
m = new RKPreviewMode(m_doc, i18n("R Console"), RKStandardIcons::getIcon(RKStandardIcons::WindowConsole), u".R"_s, RKCommandHighlighter::RScript);
m->preview_label = i18n("Preview of script running in interactive R Console");
m->setToolTip(i18n("Preview the script as if it was run in the interactive R Console"));
- enum _ConsoleOpts { Echo, Continue, None, Global, Scoped, Local };
+ enum _ConsoleOpts { Echo,
+ Continue,
+ None,
+ Global,
+ Scoped,
+ Local };
a = m->addOption(Echo, new QAction(i18n("Echo statements")));
a->setCheckable(true);
a->setChecked(true);
@@ -807,7 +816,7 @@ void RKCommandEditorWindow::initPreviewModes(KActionMenu *menu) {
for (auto *a : preview_actions) {
menu->addAction(a);
if (a == action_no_preview) continue;
- for (auto oa : static_cast<RKPreviewMode*>(a)->options) {
+ for (auto oa : static_cast<RKPreviewMode *>(a)->options) {
optmenu->addAction(oa);
connect(oa, &QAction::toggled, this, [this]() { preview_manager->setUpdatePending(); doRenderPreview(); });
oa->setVisible(false);
diff --git a/rkward/windows/rkcommandeditorwindow.h b/rkward/windows/rkcommandeditorwindow.h
index 4e94c7b2a..a3f4b0140 100644
--- a/rkward/windows/rkcommandeditorwindow.h
+++ b/rkward/windows/rkcommandeditorwindow.h
@@ -46,8 +46,8 @@ class RKCommandEditorWindowPart : public KParts::Part {
/** classes wishing to use context help should derive from this, and implement currentHelpContext() */
class RKScriptContextProvider {
public:
- RKScriptContextProvider(){};
- virtual ~RKScriptContextProvider(){};
+ RKScriptContextProvider() {};
+ virtual ~RKScriptContextProvider() {};
/** to be implemented in subclasses. Provide current context for help searches (based on current selection / current cursor position). If no package information is known, leave that empty. */
virtual void currentHelpContext(QString *symbol, QString *package) = 0;
diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.cpp
index a1e3e155b..9f85bf62c 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -180,7 +180,7 @@ class RKWebPage : public QWebEnginePage {
class RKWebView : public QWebEngineView {
public:
- explicit RKWebView(QWidget *parent) : QWebEngineView(parent){};
+ explicit RKWebView(QWidget *parent) : QWebEngineView(parent) {};
void print(QPrinter *printer) {
if (!page()) return;
QWebEngineView::forPage(page())->print(printer);
diff --git a/rkward/windows/rkhtmlwindow.h b/rkward/windows/rkhtmlwindow.h
index d8f2fc1a0..fc1540f54 100644
--- a/rkward/windows/rkhtmlwindow.h
+++ b/rkward/windows/rkhtmlwindow.h
@@ -146,7 +146,7 @@ class RKHTMLWindowPart : public KParts::Part {
Q_OBJECT
public:
explicit RKHTMLWindowPart(RKHTMLWindow *window);
- ~RKHTMLWindowPart(){};
+ ~RKHTMLWindowPart() {};
void setOutputDirectoryActionsEnabled(bool enable);
void setOutputWindowSkin();
@@ -185,7 +185,7 @@ class RKHelpRenderer {
component_xml = nullptr;
};
/** destructor */
- ~RKHelpRenderer(){};
+ ~RKHelpRenderer() {};
/** render an rkward://[page|component]-page to the device given in the ctor.
* @param container : Should be page contain dynamic elements, connections will be set up to call refresh(), on the container, as appropriate. May be nullptr. */
bool renderRKHelp(const QUrl &url, RKHTMLWindow *container);
More information about the rkward-tracker
mailing list