Commit 53076413 authored by Alexander Semke's avatar Alexander Semke

Removed couple of obsolete includes.

parent b9946140
......@@ -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).
......
......@@ -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).
......
......@@ -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 ));
}
......
......@@ -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).
......
......@@ -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
......
......@@ -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;
......
......@@ -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>
/**
......
......@@ -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;
}
......
......@@ -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");
......
......@@ -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.
......
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment