[rkward] /: Fix compiler warnings
Thomas Friedrichsmeier
null at kde.org
Fri Apr 20 08:28:11 UTC 2018
Git commit 0d010cd3d80842f8f8a717765e113e0b6b20298b by Thomas Friedrichsmeier.
Committed on 20/04/2018 at 08:28.
Pushed by tfry into branch 'master'.
Fix compiler warnings
M +1 -0 ChangeLog
M +1 -1 rkward/dataeditor/twintable.h
M +1 -2 rkward/dialogs/rkimportdialog.cpp
M +4 -4 rkward/plugin/rkinput.h
M +2 -2 rkward/plugin/rkpluginbrowser.h
M +3 -3 rkward/plugin/rkpreviewbox.h
M +3 -3 rkward/plugin/rkstandardcomponentgui.h
M +5 -5 rkward/plugin/rkvarslot.h
M +0 -1 rkward/rbackend/rdata.cpp
M +1 -1 rkward/windows/rkcommandeditorwindow.cpp
https://commits.kde.org/rkward/0d010cd3d80842f8f8a717765e113e0b6b20298b
diff --git a/ChangeLog b/ChangeLog
index 4dd18605..aca0a160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
--- Version 0.7.1 - UNRELEASED
+- Fix most compiler warnings
- File tool window gains button to switch to current working directory
- Fix a crash when closing a plugin dialog with an active plot preview
- Do not throw an error on objects that return non-numeric/non-scalar dim()
diff --git a/rkward/dataeditor/twintable.h b/rkward/dataeditor/twintable.h
index bb12b42e..c55d5a40 100644
--- a/rkward/dataeditor/twintable.h
+++ b/rkward/dataeditor/twintable.h
@@ -114,7 +114,7 @@ protected:
QActionGroup* edit_actions;
/** receives object meta change notifications. This updates the caption */
- void objectMetaChanged (RObject* changed);
+ void objectMetaChanged (RObject* changed) override;
void initActions ();
diff --git a/rkward/dialogs/rkimportdialog.cpp b/rkward/dialogs/rkimportdialog.cpp
index 67be4d0e..c20a48b1 100644
--- a/rkward/dialogs/rkimportdialog.cpp
+++ b/rkward/dialogs/rkimportdialog.cpp
@@ -2,7 +2,7 @@
rkimportdialog - description
-------------------
begin : Tue Jan 30 2007
- copyright : (C) 2007 by Thomas Friedrichsmeier
+ copyright : (C) 2007-2018 by Thomas Friedrichsmeier
email : thomas.friedrichsmeier at kdemail.net
***************************************************************************/
@@ -40,7 +40,6 @@ RKImportDialog::RKImportDialog (const QString &context_id, QWidget *parent) : QF
}
component_ids = context->components ();
- int format_count = 0;
for (QStringList::const_iterator it = component_ids.constBegin (); it != component_ids.constEnd (); ++it) {
RKComponentHandle *handle = RKComponentMap::getComponentHandle (*it);
if (!handle) {
diff --git a/rkward/plugin/rkinput.h b/rkward/plugin/rkinput.h
index 43c82036..af971c4a 100644
--- a/rkward/plugin/rkinput.h
+++ b/rkward/plugin/rkinput.h
@@ -2,7 +2,7 @@
rkinput - description
-------------------
begin : Sat Mar 10 2005
- copyright : (C) 2005, 2006, 2007, 2012, 2014 by Thomas Friedrichsmeier
+ copyright : (C) 2005-2018 by Thomas Friedrichsmeier
email : thomas.friedrichsmeier at kdemail.net
***************************************************************************/
@@ -37,9 +37,9 @@ public:
~RKInput ();
RKComponentPropertyBase *text;
- QVariant value (const QString &modifier=QString ()) { return (text->value (modifier)); };
- QStringList getUiLabelPair () const;
- int type () { return ComponentInput; };
+ QVariant value (const QString &modifier=QString ()) override { return (text->value (modifier)); };
+ QStringList getUiLabelPair () const override;
+ int type () override { return ComponentInput; };
bool isValid ();
public slots:
void textChanged ();
diff --git a/rkward/plugin/rkpluginbrowser.h b/rkward/plugin/rkpluginbrowser.h
index af058358..c15d6c48 100644
--- a/rkward/plugin/rkpluginbrowser.h
+++ b/rkward/plugin/rkpluginbrowser.h
@@ -2,7 +2,7 @@
rkpluginbrowser - description
-------------------
begin : Sat Mar 10 2005
- copyright : (C) 2005, 2006, 2007, 2012, 2014 by Thomas Friedrichsmeier
+ copyright : (C) 2005 - 2018 by Thomas Friedrichsmeier
email : thomas.friedrichsmeier at kdemail.net
***************************************************************************/
@@ -43,7 +43,7 @@ public:
RKComponentPropertyBase *selection;
QVariant value (const QString &modifier=QString ()) override { return (selection->value (modifier)); };
- QStringList getUiLabelPair () const;
+ QStringList getUiLabelPair () const override;
int type () override { return ComponentBrowser; };
ComponentStatus recursiveStatus () override { return status; };
public slots:
diff --git a/rkward/plugin/rkpreviewbox.h b/rkward/plugin/rkpreviewbox.h
index 24222a09..75af29e4 100644
--- a/rkward/plugin/rkpreviewbox.h
+++ b/rkward/plugin/rkpreviewbox.h
@@ -2,7 +2,7 @@
rkpreviewbox - description
-------------------
begin : Wed Jan 24 2007
- copyright : (C) 2007-2016 by Thomas Friedrichsmeier
+ copyright : (C) 2007-2018 by Thomas Friedrichsmeier
email : thomas.friedrichsmeier at kdemail.net
***************************************************************************/
@@ -39,7 +39,7 @@ class RKPreviewBox : public RKComponent, public RCommandReceiver {
public:
RKPreviewBox (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget);
~RKPreviewBox ();
- int type () { return ComponentPreviewBox; };
+ int type () override { return ComponentPreviewBox; };
RKComponentPropertyBool *state;
QVariant value (const QString &modifier=QString ()) override;
public slots:
@@ -48,7 +48,7 @@ public slots:
void changedCode (RKComponentPropertyBase *);
void tryPreviewNow ();
protected:
- void rCommandDone (RCommand *);
+ void rCommandDone (RCommand *) override;
private:
bool updating; // prevent recursion
bool preview_active;
diff --git a/rkward/plugin/rkstandardcomponentgui.h b/rkward/plugin/rkstandardcomponentgui.h
index 778dded6..f243c6be 100644
--- a/rkward/plugin/rkstandardcomponentgui.h
+++ b/rkward/plugin/rkstandardcomponentgui.h
@@ -2,7 +2,7 @@
rkstandardcomponentgui - description
-------------------
begin : Sun Mar 19 2006
- copyright : (C) 2006, 2007 by Thomas Friedrichsmeier
+ copyright : (C) 2006-2018 by Thomas Friedrichsmeier
email : thomas.friedrichsmeier at kdemail.net
***************************************************************************/
@@ -146,8 +146,8 @@ public:
RKStandardComponentWizard (RKStandardComponent *component, RKComponentPropertyCode *code_property, bool enslaved);
~RKStandardComponentWizard ();
- void enableSubmit (bool enable);
- void updateCode ();
+ void enableSubmit (bool enable) override;
+ void updateCode () override;
void createWizard (bool switchable);
/** Adds a standard last page in the wizard, and initializes the view to the first page */
void finalize () override;
diff --git a/rkward/plugin/rkvarslot.h b/rkward/plugin/rkvarslot.h
index 4808d14c..021ec9ff 100644
--- a/rkward/plugin/rkvarslot.h
+++ b/rkward/plugin/rkvarslot.h
@@ -2,7 +2,7 @@
rkvarslot.h - description
-------------------
begin : Thu Nov 7 2002
- copyright : (C) 2002 - 2015 by Thomas Friedrichsmeier
+ copyright : (C) 2002 - 2018 by Thomas Friedrichsmeier
email : thomas.friedrichsmeier at kdemail.net
***************************************************************************/
@@ -40,11 +40,11 @@ class RKVarSlot : public RKComponent {
public:
RKVarSlot (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget);
~RKVarSlot ();
- int type () {return ComponentVarSlot; };
- QVariant value (const QString &modifier=QString ()) { return (available->value (modifier)); };
- QStringList getUiLabelPair () const;
+ int type () override {return ComponentVarSlot; };
+ QVariant value (const QString &modifier=QString ()) override { return (available->value (modifier)); };
+ QStringList getUiLabelPair () const override;
/** reimplemented to call updateLook (), in case enabledness changed */
- void changed () { updateLook (); RKComponent::changed (); };
+ void changed () override { updateLook (); RKComponent::changed (); };
void updateLook ();
public slots:
/** Called when the select-button is pressed */
diff --git a/rkward/rbackend/rdata.cpp b/rkward/rbackend/rdata.cpp
index 08171193..e4a1f96e 100644
--- a/rkward/rbackend/rdata.cpp
+++ b/rkward/rbackend/rdata.cpp
@@ -61,7 +61,6 @@ void RData::discardData () {
}
unsigned int RData::getDataLength() const {
- if (!this) return 0;
if (datatype == RealVector) return (static_cast<RealStorage *> (data)->size ());
if (datatype == IntVector) return (static_cast<IntStorage *> (data)->size ());
if (datatype == StringVector) return (static_cast<StringStorage *> (data)->size ());
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index c791cbbc..8dac198b 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -2,7 +2,7 @@
rkcommandeditorwindow - description
-------------------
begin : Mon Aug 30 2004
- copyright : (C) 2004-2017 by Thomas Friedrichsmeier
+ copyright : (C) 2004-2018 by Thomas Friedrichsmeier
email : thomas.friedrichsmeier at kdemail.net
***************************************************************************/
More information about the rkward-tracker
mailing list