[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kst-plot] src: Fix minor EBN issues
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-09-01 15:32:32
Message-ID: E1fw7t2-0008IP-Tw () code ! kde ! org
[Download RAW message or body]
Git commit ae771d494038941865d5aa1ede9f80f3a332c041 by Yuri Chornoivan.
Committed on 01/09/2018 at 15:23.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues
M +2 -2 src/datasources/ascii/asciiconfigwidget.h
M +2 -2 src/datasources/bis/bisdatasource.h
M +2 -2 src/datasources/its/itsdatasource.h
M +2 -2 src/kst/main.cpp
M +2 -2 src/libkst/stdinsource.h
M +0 -1 src/libkst/vscalar.cpp
M +0 -1 src/libkstapp/commandlineparser.cpp
M +5 -0 src/plugins/dataobject/interpolations/interpolations.h
M +5 -0 src/plugins/filters/filters.h
M +1 -1 src/plugins/filters/flag/filterflag.cpp
M +5 -0 src/plugins/fits/common.h
M +4 -0 src/plugins/fits/linear.h
M +5 -0 src/plugins/fits/linear_weighted.h
M +5 -0 src/plugins/fits/non_linear.h
M +5 -0 src/plugins/fits/non_linear_weighted.h
M +1 -1 src/plugins/sampleplugin/sampleplugin.cpp
https://commits.kde.org/kst-plot/ae771d494038941865d5aa1ede9f80f3a332c041
diff --git a/src/datasources/ascii/asciiconfigwidget.h \
b/src/datasources/ascii/asciiconfigwidget.h index 0165b8d8..b580b898 100644
--- a/src/datasources/ascii/asciiconfigwidget.h
+++ b/src/datasources/ascii/asciiconfigwidget.h
@@ -10,8 +10,8 @@
* *
***************************************************************************/
-#ifndef ASCIICONFIGWINDGET_H
-#define ASCIICONFIGWINDGET_H
+#ifndef ASCIICONFIGWIDGET_H
+#define ASCIICONFIGWIDGET_H
#include "asciisource.h"
#include "dataplugin.h"
diff --git a/src/datasources/bis/bisdatasource.h \
b/src/datasources/bis/bisdatasource.h index 6037c4b3..f7399f32 100644
--- a/src/datasources/bis/bisdatasource.h
+++ b/src/datasources/bis/bisdatasource.h
@@ -11,8 +11,8 @@
***************************************************************************/
-#ifndef BISSOURCE_H
-#define BISSOURCE_H
+#ifndef BISDATASOURCE_H
+#define BISDATASOURCE_H
#include <datasource.h>
#include <dataplugin.h>
diff --git a/src/datasources/its/itsdatasource.h \
b/src/datasources/its/itsdatasource.h index b07140d2..6f7b6403 100644
--- a/src/datasources/its/itsdatasource.h
+++ b/src/datasources/its/itsdatasource.h
@@ -11,8 +11,8 @@
***************************************************************************/
-#ifndef ITSSOURCE_H
-#define ITSSOURCE_H
+#ifndef ITSDATASOURCE_H
+#define ITSDATASOURCE_H
#include <datasource.h>
#include <dataplugin.h>
diff --git a/src/kst/main.cpp b/src/kst/main.cpp
index b3bd70d7..5a88410e 100644
--- a/src/kst/main.cpp
+++ b/src/kst/main.cpp
@@ -44,8 +44,8 @@ int main(int argc, char *argv[]) {
QApplication::setGraphicsSystem("raster");
} else {
// this must be actually set, since raster is now the
- // default under linux. Native is strongly prefered
- // for remote X, and raster mildly prefered otherwise.
+ // default under linux. Native is strongly preferred
+ // for remote X, and raster mildly preferred otherwise.
// Note: for QT5, "native" is gone. Which is bad for
// remote X users. Sigh...
QApplication::setGraphicsSystem("native");
diff --git a/src/libkst/stdinsource.h b/src/libkst/stdinsource.h
index ce2bc64d..b346502c 100644
--- a/src/libkst/stdinsource.h
+++ b/src/libkst/stdinsource.h
@@ -15,8 +15,8 @@
* *
***************************************************************************/
-#ifndef STDINSRC_H
-#define STDINSRC_H
+#ifndef STDINSOURCE_H
+#define STDINSOURCE_H
#include "datasource.h"
diff --git a/src/libkst/vscalar.cpp b/src/libkst/vscalar.cpp
index c1665593..217b88fd 100644
--- a/src/libkst/vscalar.cpp
+++ b/src/libkst/vscalar.cpp
@@ -25,7 +25,6 @@
#include "debug.h"
#include "objectstore.h"
#include "updatemanager.h"
-#include "vscalar.h"
#include "scalarscriptinterface.h"
namespace Kst {
diff --git a/src/libkstapp/commandlineparser.cpp \
b/src/libkstapp/commandlineparser.cpp index 00db3b07..f9bbf7ce 100644
--- a/src/libkstapp/commandlineparser.cpp
+++ b/src/libkstapp/commandlineparser.cpp
@@ -36,7 +36,6 @@
#include "updatemanager.h"
#include "dialogdefaults.h"
-#include "datasourcepluginmanager.h"
namespace Kst {
diff --git a/src/plugins/dataobject/interpolations/interpolations.h \
b/src/plugins/dataobject/interpolations/interpolations.h index 02f1eff1..3eb5b83f \
100644
--- a/src/plugins/dataobject/interpolations/interpolations.h
+++ b/src/plugins/dataobject/interpolations/interpolations.h
@@ -12,6 +12,9 @@
* *
***************************************************************************/
+#ifndef INTERPOLATIONS_H
+#define INTERPOLATIONS_H
+
#include <vector.h>
bool interpolate(Kst::VectorPtr xVector,
@@ -79,3 +82,5 @@ bool interpolate(Kst::VectorPtr xVector,
return bReturn;
}
+
+#endif
diff --git a/src/plugins/filters/filters.h b/src/plugins/filters/filters.h
index 46fd8d58..427edf58 100644
--- a/src/plugins/filters/filters.h
+++ b/src/plugins/filters/filters.h
@@ -17,6 +17,9 @@
* Released under the terms of the GPL
*/
+#ifndef FILTERS_H
+#define FILTERS_H
+
#include <stdlib.h>
#include <math.h>
#include <string.h>
@@ -166,3 +169,5 @@ bool kst_pass_filter(
}
return bReturn;
}
+
+#endif
diff --git a/src/plugins/filters/flag/filterflag.cpp \
b/src/plugins/filters/flag/filterflag.cpp index f2d291a3..a3e65573 100644
--- a/src/plugins/filters/flag/filterflag.cpp
+++ b/src/plugins/filters/flag/filterflag.cpp
@@ -233,7 +233,7 @@ bool FilterFlagSource::algorithm() {
Kst::LabelInfo label_info = inputVector->labelInfo();
- label_info.name = tr("Flaged %1").arg(label_info.name);
+ label_info.name = tr("Flagged %1").arg(label_info.name);
outputVector->setLabelInfo(label_info);
return true;
diff --git a/src/plugins/fits/common.h b/src/plugins/fits/common.h
index 8b0d7261..c416ff0b 100644
--- a/src/plugins/fits/common.h
+++ b/src/plugins/fits/common.h
@@ -10,6 +10,9 @@
* *
***************************************************************************/
+#ifndef FITS_COMMON_H
+#define FITS_COMMON_H
+
#include <stdlib.h>
#include <string.h>
#include <math.h>
@@ -148,3 +151,5 @@ void postcursor( bool bWeighted, double* pInputs[]) {
}
}
}
+
+#endif
diff --git a/src/plugins/fits/linear.h b/src/plugins/fits/linear.h
index c2028763..42488859 100644
--- a/src/plugins/fits/linear.h
+++ b/src/plugins/fits/linear.h
@@ -10,6 +10,8 @@
* *
***************************************************************************/
+#ifndef LINEAR_H
+#define LINEAR_H
#include <gsl/gsl_multifit.h>
#include "common.h"
@@ -129,3 +131,5 @@ bool kstfit_linear_unweighted(
return bReturn;
}
+
+#endif
diff --git a/src/plugins/fits/linear_weighted.h b/src/plugins/fits/linear_weighted.h
index 82d960a6..03c6ef49 100644
--- a/src/plugins/fits/linear_weighted.h
+++ b/src/plugins/fits/linear_weighted.h
@@ -10,6 +10,9 @@
* *
***************************************************************************/
+#ifndef LINEAR_WEIGHTED_H
+#define LINEAR_WEIGHTED_H
+
#include <stdlib.h>
#include <math.h>
#include <gsl/gsl_multifit.h>
@@ -133,3 +136,5 @@ bool kstfit_linear_weighted(
return bReturn;
}
+
+#endif
diff --git a/src/plugins/fits/non_linear.h b/src/plugins/fits/non_linear.h
index babc9986..4118338e 100644
--- a/src/plugins/fits/non_linear.h
+++ b/src/plugins/fits/non_linear.h
@@ -10,6 +10,9 @@
* *
***************************************************************************/
+#ifndef NON_LINEAR_H
+#define NON_LINEAR_H
+
#include <stdlib.h>
#include <string.h>
#include <math.h>
@@ -249,3 +252,5 @@ bool kstfit_nonlinear(
return bReturn;
}
+
+#endif
diff --git a/src/plugins/fits/non_linear_weighted.h \
b/src/plugins/fits/non_linear_weighted.h index 160eeb5a..ec28b035 100644
--- a/src/plugins/fits/non_linear_weighted.h
+++ b/src/plugins/fits/non_linear_weighted.h
@@ -10,6 +10,9 @@
* *
***************************************************************************/
+#ifndef NON_LINEAR_WEIGHTED_H
+#define NON_LINEAR_WEIGHTED_H
+
#include <stdlib.h>
#include <string.h>
#include <math.h>
@@ -264,3 +267,5 @@ bool kstfit_nonlinear_weighted(
}
return bReturn;
}
+
+#endif
diff --git a/src/plugins/sampleplugin/sampleplugin.cpp \
b/src/plugins/sampleplugin/sampleplugin.cpp index 06ea309f..2c0c3038 100644
--- a/src/plugins/sampleplugin/sampleplugin.cpp
+++ b/src/plugins/sampleplugin/sampleplugin.cpp
@@ -142,7 +142,7 @@ QString SamplePluginSource::_automaticDescriptiveName() const {
// Change is used to configure the DataObject and will be run immediately after \
initial creation as well as
-// when modifications have occured.
+// when modifications have occurred.
void SamplePluginSource::change(Kst::DataObjectConfigWidget *configWidget) {
if (ConfigWidgetSamplePlugin* config = \
static_cast<ConfigWidgetSamplePlugin*>(configWidget)) { setInputVector(VECTOR_IN, \
config->selectedVector());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic