[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [labplot] src/backend/core/datatypes: Removed couple of obsolete includes.
From: Alexander Semke <alexander.semke () web ! de>
Date: 2015-02-28 19:30:16
Message-ID: E1YRn5c-0004vs-3k () scm ! kde ! org
[Download RAW message or body]
Git commit 5307641337eb9f75c6524969bbc8afad4d245f56 by Alexander Semke.
Committed on 28/02/2015 at 19:29.
Pushed by asemke into branch 'master'.
Removed couple of obsolete includes.
M +0 -4 src/backend/core/datatypes/DateTime2DoubleFilter.h
M +2 -4 src/backend/core/datatypes/DayOfWeek2DoubleFilter.h
M +2 -6 src/backend/core/datatypes/Double2DateTimeFilter.h
M +1 -3 src/backend/core/datatypes/Double2DayOfWeekFilter.h
M +1 -3 src/backend/core/datatypes/Double2MonthFilter.h
M +3 -4 src/backend/core/datatypes/Double2StringFilter.h
M +2 -4 src/backend/core/datatypes/Month2DoubleFilter.h
M +2 -4 src/backend/core/datatypes/SimpleCopyThroughFilter.h
M +5 -7 src/backend/core/datatypes/String2DayOfWeekFilter.h
M +1 -3 src/backend/core/datatypes/String2DoubleFilter.h
M +4 -6 src/backend/core/datatypes/String2MonthFilter.h
http://commits.kde.org/labplot/5307641337eb9f75c6524969bbc8afad4d245f56
diff --git a/src/backend/core/datatypes/DateTime2DoubleFilter.h \
b/src/backend/core/datatypes/DateTime2DoubleFilter.h index 695fd8f..a753c04 100644
--- a/src/backend/core/datatypes/DateTime2DoubleFilter.h
+++ b/src/backend/core/datatypes/DateTime2DoubleFilter.h
@@ -31,10 +31,6 @@
#include "../AbstractSimpleFilter.h"
#include <QDateTime>
-#include <QDate>
-#include <QTime>
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
#include <math.h>
//! Conversion filter QDateTime -> double (using Julian day).
diff --git a/src/backend/core/datatypes/DayOfWeek2DoubleFilter.h \
b/src/backend/core/datatypes/DayOfWeek2DoubleFilter.h index 244377e..c8662ac 100644
--- a/src/backend/core/datatypes/DayOfWeek2DoubleFilter.h
+++ b/src/backend/core/datatypes/DayOfWeek2DoubleFilter.h
@@ -6,7 +6,7 @@
Email (use @ for *) : knut.franke*gmx.de, thzs@gmx.net
Description : Conversion filter QDateTime -> double, translating
dates into days of the week (Monday -> 1).
-
+
***************************************************************************/
/***************************************************************************
@@ -31,9 +31,7 @@
#define DAY_OF_WEEK2DOUBLE_FILTER_H
#include "../AbstractSimpleFilter.h"
-#include <QDateTime>
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
+#include <QDate>
#include <math.h>
//! Conversion filter QDateTime -> double, translating dates into days of the week \
(Monday -> 1).
diff --git a/src/backend/core/datatypes/Double2DateTimeFilter.h \
b/src/backend/core/datatypes/Double2DateTimeFilter.h index 0cca365..764c6e4 100644
--- a/src/backend/core/datatypes/Double2DateTimeFilter.h
+++ b/src/backend/core/datatypes/Double2DateTimeFilter.h
@@ -6,7 +6,7 @@
Email (use @ for *) : knut.franke*gmx.de, thzs@gmx.net
Description : Conversion filter double -> QDateTime, interpreting
the input numbers as (fractional) Julian days.
-
+
***************************************************************************/
/***************************************************************************
@@ -32,10 +32,6 @@
#include "../AbstractSimpleFilter.h"
#include <QDateTime>
-#include <QDate>
-#include <QTime>
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
#include <math.h>
//! Conversion filter double -> QDateTime, interpreting the input numbers as \
(fractional) Julian days. @@ -54,7 +50,7 @@ class Double2DateTimeFilter : public \
AbstractSimpleFilter if (!m_inputs.value(0)) return QTime();
double inputValue = m_inputs.value(0)->valueAt(row);
if (isnan(inputValue)) return QTime();
- // we only want the digits behind the dot and
+ // we only want the digits behind the dot and
// convert them from fraction of day to milliseconds
return QTime(12,0,0,0).addMSecs(int( (inputValue - int(inputValue)) * 86400000.0 \
)); }
diff --git a/src/backend/core/datatypes/Double2DayOfWeekFilter.h \
b/src/backend/core/datatypes/Double2DayOfWeekFilter.h index 151c046..af75f7c 100644
--- a/src/backend/core/datatypes/Double2DayOfWeekFilter.h
+++ b/src/backend/core/datatypes/Double2DayOfWeekFilter.h
@@ -6,7 +6,7 @@
Email (use @ for *) : knut.franke*gmx.de, thzs@gmx.net
Description : Conversion filter double -> QDateTime, interpreting
the input numbers as days of the week (1 -> Monday).
-
+
***************************************************************************/
/***************************************************************************
@@ -32,8 +32,6 @@
#include "../AbstractSimpleFilter.h"
#include <QDateTime>
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
#include <math.h>
//! Conversion filter double -> QDateTime, interpreting the input numbers as days of \
the week (1 = Monday).
diff --git a/src/backend/core/datatypes/Double2MonthFilter.h \
b/src/backend/core/datatypes/Double2MonthFilter.h index 1ca5da0..9496b48 100644
--- a/src/backend/core/datatypes/Double2MonthFilter.h
+++ b/src/backend/core/datatypes/Double2MonthFilter.h
@@ -6,7 +6,7 @@
Email (use @ for *) : knut.franke*gmx.de, thzs@gmx.net
Description : Conversion filter double -> QDateTime, interpreting
the input numbers as months of the year.
-
+
***************************************************************************/
/***************************************************************************
@@ -33,8 +33,6 @@
#include "../AbstractSimpleFilter.h"
#include <QDateTime>
#include <math.h>
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
//! Conversion filter double -> QDateTime, interpreting the input numbers as months \
of the year. class Double2MonthFilter : public AbstractSimpleFilter
diff --git a/src/backend/core/datatypes/Double2StringFilter.h \
b/src/backend/core/datatypes/Double2StringFilter.h index 882e496..cefcd68 100644
--- a/src/backend/core/datatypes/Double2StringFilter.h
+++ b/src/backend/core/datatypes/Double2StringFilter.h
@@ -5,7 +5,7 @@
Copyright : (C) 2007 by Knut Franke, Tilman Benkert
Email (use @ for *) : knut.franke*gmx.de, thzs@gmx.net
Description : Locale-aware conversion filter double -> QString.
-
+
***************************************************************************/
/***************************************************************************
@@ -31,7 +31,6 @@
#include "../AbstractSimpleFilter.h"
#include <QLocale>
-#include <QChar>
#include <math.h>
//! Locale-aware conversion filter double -> QString.
@@ -58,9 +57,9 @@ class Double2StringFilter : public AbstractSimpleFilter
private:
friend class Double2StringFilterSetFormatCmd;
friend class Double2StringFilterSetDigitsCmd;
- //! Format character as in QString::number
+ //! Format character as in QString::number
char m_format;
- //! Display digits or precision as in QString::number
+ //! Display digits or precision as in QString::number
int m_digits;
diff --git a/src/backend/core/datatypes/Month2DoubleFilter.h \
b/src/backend/core/datatypes/Month2DoubleFilter.h index 373a4fd..fdf21c8 100644
--- a/src/backend/core/datatypes/Month2DoubleFilter.h
+++ b/src/backend/core/datatypes/Month2DoubleFilter.h
@@ -6,7 +6,7 @@
Email (use @ for *) : knut.franke*gmx.de, thzs@gmx.net
Description : Conversion filter QDateTime -> double, translating
dates into months (January -> 1).
-
+
***************************************************************************/
/***************************************************************************
@@ -31,9 +31,7 @@
#define MONTH2DOUBLE_FILTER_H
#include "../AbstractSimpleFilter.h"
-#include <QDateTime>
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
+#include <QDate>
#include <math.h>
/**
diff --git a/src/backend/core/datatypes/SimpleCopyThroughFilter.h \
b/src/backend/core/datatypes/SimpleCopyThroughFilter.h index 74f7053..0c3600d 100644
--- a/src/backend/core/datatypes/SimpleCopyThroughFilter.h
+++ b/src/backend/core/datatypes/SimpleCopyThroughFilter.h
@@ -31,8 +31,6 @@
#define SIMPLE_COPY_THROUGH_FILTER_H
#include "backend/core/AbstractSimpleFilter.h"
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
/**
* \brief Filter which copies the provided input unaltered to the output
@@ -42,7 +40,7 @@
*
* The difference between this filter and CopyThroughFilter is that
* this inherits AbstractColumn and thus can be directly used
- * as input for other filters and plot functions.
+ * as input for other filters and plot functions.
*/
class SimpleCopyThroughFilter : public AbstractSimpleFilter
{
@@ -50,7 +48,7 @@ class SimpleCopyThroughFilter : public AbstractSimpleFilter
protected:
//! All types are accepted.
- virtual bool inputAcceptable(int, const AbstractColumn *)
+ virtual bool inputAcceptable(int, const AbstractColumn *)
{
return true;
}
diff --git a/src/backend/core/datatypes/String2DayOfWeekFilter.h \
b/src/backend/core/datatypes/String2DayOfWeekFilter.h index c87ef8a..eb6e749 100644
--- a/src/backend/core/datatypes/String2DayOfWeekFilter.h
+++ b/src/backend/core/datatypes/String2DayOfWeekFilter.h
@@ -6,7 +6,7 @@
Email (use @ for *) : knut.franke*gmx.de, thzs*gmx.net
Description : Conversion filter String -> QDateTime, interpreting
the input as days of the week (either numeric or "Mon" \
etc).
-
+
***************************************************************************/
/***************************************************************************
@@ -33,8 +33,6 @@
#include "../AbstractSimpleFilter.h"
#include <QDateTime>
#include <math.h>
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
//! Conversion filter String -> QDateTime, interpreting the input as days of the \
week (either numeric or "Mon" etc). class String2DayOfWeekFilter : public \
AbstractSimpleFilter @@ -42,12 +40,12 @@ class String2DayOfWeekFilter : public \
AbstractSimpleFilter Q_OBJECT
public:
- virtual QDate dateAt(int row) const
+ virtual QDate dateAt(int row) const
{
return dateTimeAt(row).date();
}
- virtual QTime timeAt(int row) const
+ virtual QTime timeAt(int row) const
{
return dateTimeAt(row).time();
}
@@ -62,7 +60,7 @@ class String2DayOfWeekFilter : public AbstractSimpleFilter
int day_value = input_value.toInt(&ok);
if(!ok)
{
-#if QT_VERSION <= 0x040300
+#if QT_VERSION <= 0x040300
// workaround for Qt bug #171920
QDate temp = QDate(1900,1,1);
for(int i=1; i<=7; i++)
@@ -73,7 +71,7 @@ class String2DayOfWeekFilter : public AbstractSimpleFilter
break;
}
-#else
+#else
QDate temp = QDate::fromString(input_value, "ddd");
if(!temp.isValid())
temp = QDate::fromString(input_value, "dddd");
diff --git a/src/backend/core/datatypes/String2DoubleFilter.h \
b/src/backend/core/datatypes/String2DoubleFilter.h index 88b0928..c328b91 100644
--- a/src/backend/core/datatypes/String2DoubleFilter.h
+++ b/src/backend/core/datatypes/String2DoubleFilter.h
@@ -5,7 +5,7 @@
Copyright : (C) 2007 by Knut Franke
Email (use @ for *) : knut.franke*gmx.de
Description : Locale-aware conversion filter QString -> double.
-
+
***************************************************************************/
/***************************************************************************
@@ -31,8 +31,6 @@
#include "../AbstractSimpleFilter.h"
#include <QLocale>
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
#include <math.h>
//! Locale-aware conversion filter QString -> double.
diff --git a/src/backend/core/datatypes/String2MonthFilter.h \
b/src/backend/core/datatypes/String2MonthFilter.h index 51c14d3..c4137a2 100644
--- a/src/backend/core/datatypes/String2MonthFilter.h
+++ b/src/backend/core/datatypes/String2MonthFilter.h
@@ -6,7 +6,7 @@
Email (use @ for *) : knut.franke*gmx.de, thzs*gmx.net
Description : Conversion filter String -> QDateTime, interpreting
the input as months of the year (either numeric or "Jan" \
etc).
-
+
***************************************************************************/
/***************************************************************************
@@ -33,8 +33,6 @@
#include "../AbstractSimpleFilter.h"
#include <QDateTime>
#include <math.h>
-#include "backend/lib/XmlStreamReader.h"
-#include <QXmlStreamWriter>
//! Conversion filter String -> QDateTime, interpreting the input as months of the \
year (either numeric or "Jan" etc). class String2MonthFilter : public \
AbstractSimpleFilter @@ -42,17 +40,17 @@ class String2MonthFilter : public \
AbstractSimpleFilter Q_OBJECT
public:
- virtual QDate dateAt(int row) const
+ virtual QDate dateAt(int row) const
{
return dateTimeAt(row).date();
}
- virtual QTime timeAt(int row) const
+ virtual QTime timeAt(int row) const
{
return dateTimeAt(row).time();
}
- virtual QDateTime dateTimeAt(int row) const
+ virtual QDateTime dateTimeAt(int row) const
{
if (!m_inputs.value(0)) return QDateTime();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic