diff --git a/src/KChart/KChartGlobal.h b/src/KChart/KChartGlobal.h
index f4945e9..dbdb959 100644
--- a/src/KChart/KChartGlobal.h
+++ b/src/KChart/KChartGlobal.h
@@ -1,208 +1,208 @@
/*
* Copyright (C) 2001-2015 Klaralvdalens Datakonsult AB. All rights reserved.
*
* This file is part of the KD Chart library.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-/** \file KChartGlobal
+/** \file KChartGlobal.h
\brief Contains KChart macros.
Contains KChart macros. */
#ifndef __KCHARTGLOBAL_H__
#define __KCHARTGLOBAL_H__
#include
#include "kchart_export.h"
#ifndef KDAB_SET_OBJECT_NAME
template
inline T & __kdab__dereference_for_methodcall( T & o ) {
return o;
}
template
inline T & __kdab__dereference_for_methodcall( T * o ) {
return *o;
}
#define KDAB_SET_OBJECT_NAME( x ) __kdab__dereference_for_methodcall( x ).setObjectName( QLatin1String( #x ) )
#endif
#define KCHART_DECLARE_PRIVATE_DERIVED( X ) \
public: \
class Private; \
protected: \
inline Private * d_func(); \
inline const Private * d_func() const; \
explicit inline X( Private * ); \
private: \
void init();
#define KCHART_DECLARE_PRIVATE_DERIVED_PARENT( X, ParentType ) \
public: \
class Private; \
protected: \
inline Private * d_func(); \
inline const Private * d_func() const; \
explicit inline X( Private *, ParentType ); \
private: \
void init();
#define KCHART_DECLARE_PRIVATE_DERIVED_QWIDGET( X ) \
KCHART_DECLARE_PRIVATE_DERIVED_PARENT( X, QWidget* )
#define KCHART_DECLARE_PRIVATE_BASE_VALUE( X ) \
public: \
inline void swap( X & other ) { qSwap( _d, other._d ); } \
protected: \
class Private; \
Private * d_func() { return _d; } \
const Private * d_func() const { return _d; } \
private: \
void init(); \
Private * _d;
#define KCHART_DECLARE_PRIVATE_BASE_POLYMORPHIC( X ) \
public: \
class Private; \
protected: \
Private * d_func() { return _d; } \
const Private * d_func() const { return _d; } \
explicit inline X( Private * ); \
private: \
void init(); \
Private * _d;
#define KCHART_DECLARE_PRIVATE_BASE_POLYMORPHIC_QWIDGET( X ) \
public: \
class Private; \
protected: \
Private * d_func() { return _d; } \
const Private * d_func() const { return _d; } \
explicit inline X( Private *, QWidget* ); \
private: \
void init(); \
Private * _d;
#define KCHART_DERIVED_PRIVATE_FOOTER( CLASS, PARENT ) \
inline CLASS::CLASS( Private * p ) \
: PARENT( p ) { init(); } \
inline CLASS::Private * CLASS::d_func() \
{ return static_cast( PARENT::d_func() ); } \
inline const CLASS::Private * CLASS::d_func() const \
{ return static_cast( PARENT::d_func() ); }
#define KCHART_DECLARE_DERIVED_DIAGRAM( X, PLANE ) \
public: \
class Private; \
protected: \
inline Private * d_func(); \
inline const Private * d_func() const; \
explicit inline X( Private * ); \
explicit inline X( Private *, QWidget *, PLANE * ); \
private: \
void init();
#define KCHART_IMPL_DERIVED_DIAGRAM( CLASS, PARENT, PLANE ) \
inline CLASS::CLASS( Private * p ) \
: PARENT( p ) { init(); } \
inline CLASS::CLASS( \
Private * p, QWidget* parent, PLANE * plane ) \
: PARENT( p, parent, plane ) { init(); } \
inline CLASS::Private * CLASS::d_func() \
{ return static_cast( PARENT::d_func() ); } \
inline const CLASS::Private * CLASS::d_func() const \
{ return static_cast( PARENT::d_func() ); }
#define KCHART_IMPL_DERIVED_PLANE( CLASS, BASEPLANE ) \
inline CLASS::CLASS( Private * p, Chart* parent ) \
: BASEPLANE( p, parent ) { init(); } \
inline CLASS::Private * CLASS::d_func() \
{ return static_cast( BASEPLANE::d_func() ); } \
inline const CLASS::Private * CLASS::d_func() const \
{ return static_cast( BASEPLANE::d_func() ); }
#include // qSwap
#ifndef QT_NO_STL
#include
#define KCHART_DECLARE_SWAP_SPECIALISATION( X ) \
QT_BEGIN_NAMESPACE \
template <> inline void qSwap( X & lhs, X & rhs ) \
{ lhs.swap( rhs ); } \
QT_END_NAMESPACE \
namespace std { \
template <> inline void swap( X & lhs, X & rhs ) \
{ lhs.swap( rhs ); } \
}
#else
#define KCHART_DECLARE_SWAP_SPECIALISATION( X ) \
QT_BEGIN_NAMESPACE \
template <> inline void qSwap( X & lhs, X & rhs ) \
{ lhs.swap( rhs ); } \
QT_END_NAMESPACE
#endif
#define KCHART_DECLARE_SWAP_SPECIALISATION_DERIVED( X ) \
KCHART_DECLARE_SWAP_SPECIALISATION( X )
#define KCHART_DECLARE_SWAP_BASE( X ) \
protected: \
void doSwap( X& other ) \
{ qSwap( _d, other._d); }
#define KCHART_DECLARE_SWAP_DERIVED( X ) \
void swap( X& other ) { doSwap( other ); }
#if defined(Q_OS_WIN) && defined(QT_DLL)
#if defined(_MSC_VER) && _MSC_VER >= 1300
// workaround http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
#include
#include
template class Q_DECL_IMPORT QVector;
#endif
#endif
#include
/**
\namespace KChart
\brief Global namespace
*/
namespace KChart {
enum DisplayRoles {
DatasetPenRole = 0x0A79EF95,
DatasetBrushRole,
DataValueLabelAttributesRole,
ThreeDAttributesRole,
LineAttributesRole,
ThreeDLineAttributesRole,
BarAttributesRole,
StockBarAttributesRole,
ThreeDBarAttributesRole,
PieAttributesRole,
ThreeDPieAttributesRole,
DataHiddenRole,
ValueTrackerAttributesRole,
CommentRole
};
}
#endif // __KCHARTGLOBAL_H__
diff --git a/src/KGantt/kganttglobal.h b/src/KGantt/kganttglobal.h
index c92ce50..916c859 100644
--- a/src/KGantt/kganttglobal.h
+++ b/src/KGantt/kganttglobal.h
@@ -1,308 +1,308 @@
/*
* Copyright (C) 2001-2015 Klaralvdalens Datakonsult AB. All rights reserved.
*
* This file is part of the KGantt library.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-/** \file KGanttGlobal.h
+/** \file kganttglobal.h
\brief Contains KGantt macros.
Contains KGantt macros. */
#ifndef KGANTTGLOBAL_H
#define KGANTTGLOBAL_H
#include
#include
#include
#include
#include "kgantt_export.h"
#if (defined(__MINGW32__) || defined(__MINGW64__)) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 4) && (__GNUC_PATCHLEVEL__ == 0)
// workaround a mingw bug, http://sourceforge.net/tracker/index.php?func=detail&aid=2373234&group_id=2435&atid=102435
int swprintf (wchar_t *, size_t, const wchar_t *, ...);
int vswprintf(wchar_t *, const wchar_t *, va_list);
#endif
#ifndef KDAB_SET_OBJECT_NAME
template
inline T & __kdab__dereference_for_methodcall( T & o ) {
return o;
}
template
inline T & __kdab__dereference_for_methodcall( T * o ) {
return *o;
}
#define KDAB_SET_OBJECT_NAME( x ) __kdab__dereference_for_methodcall( x ).setObjectName( QLatin1String( #x ) )
#endif
#if defined(_MSC_VER) && _MSC_VER <= 1300
#define KGANTT_DECLARE_PRIVATE_DERIVED( X ) \
public: \
class Private; \
friend class Private; \
protected: \
inline Private * d_func(); \
inline const Private * d_func() const; \
explicit inline X( Private * ); \
private: \
void init();
#else
#define KGANTT_DECLARE_PRIVATE_DERIVED( X ) \
protected: \
class Private; \
friend class Private; \
inline Private * d_func(); \
inline const Private * d_func() const; \
explicit inline X( Private * ); \
private: \
void init();
#endif
#if defined(_MSC_VER) && _MSC_VER <= 1300
#define KGANTT_DECLARE_PRIVATE_DERIVED_PARENT( X, ParentType ) \
public: \
class Private; \
friend class Private; \
protected: \
inline Private * d_func(); \
inline const Private * d_func() const; \
explicit inline X( Private *, ParentType ); \
private: \
void init();
#else
#define KGANTT_DECLARE_PRIVATE_DERIVED_PARENT( X, ParentType ) \
protected: \
class Private; \
friend class Private; \
inline Private * d_func(); \
inline const Private * d_func() const; \
explicit inline X( Private *, ParentType ); \
private: \
void init();
#endif
#define KGANTT_DECLARE_PRIVATE_DERIVED_QWIDGET( X ) \
KGANTT_DECLARE_PRIVATE_DERIVED_PARENT( X, QWidget* )
#define KGANTT_DECLARE_PRIVATE_BASE_VALUE( X ) \
public: \
inline void swap( X & other ) { qSwap( _d, other._d ); } \
protected: \
class Private; \
friend class Private; \
Private * d_func() { return _d; } \
const Private * d_func() const { return _d; } \
private: \
void init(); \
Private * _d;
#if defined(_MSC_VER) && _MSC_VER <= 1300
#define KGANTT_DECLARE_PRIVATE_BASE_POLYMORPHIC( X ) \
public: \
class Private; \
friend class Private; \
protected: \
Private * d_func() { return _d; } \
const Private * d_func() const { return _d; } \
explicit inline X( Private * ); \
private: \
void init(); \
Private * _d;
#else
#define KGANTT_DECLARE_PRIVATE_BASE_POLYMORPHIC( X ) \
protected: \
class Private; \
friend class Private; \
Private * d_func() { return _d; } \
const Private * d_func() const { return _d; } \
explicit inline X( Private * ); \
private: \
void init(); \
Private * _d;
#endif
#if defined(_MSC_VER) && _MSC_VER <= 1300
#define KGANTT_DECLARE_PRIVATE_BASE_POLYMORPHIC_QWIDGET( X ) \
public: \
class Private; \
friend class Private; \
protected: \
Private * d_func() { return _d; } \
const Private * d_func() const { return _d; } \
explicit inline X( Private *, QWidget* ); \
private: \
void init(); \
Private * _d;
#else
#define KGANTT_DECLARE_PRIVATE_BASE_POLYMORPHIC_QWIDGET( X ) \
protected: \
class Private; \
friend class Private; \
Private * d_func() { return _d; } \
const Private * d_func() const { return _d; } \
explicit inline X( Private *, QWidget* ); \
private: \
void init(); \
Private * _d;
#endif
// enable this for testing if KD Gantt works without STL support in Qt:
//
// #define QT_NO_STL
#include // qSwap
#ifndef QT_NO_STL
#include
#define KGANTT_DECLARE_SWAP_SPECIALISATION( X ) \
QT_BEGIN_NAMESPACE \
template <> inline void qSwap( X & lhs, X & rhs ) \
{ lhs.swap( rhs ); } \
QT_END_NAMESPACE \
namespace std { \
template <> inline void swap( X & lhs, X & rhs ) \
{ lhs.swap( rhs ); } \
}
#else
#define KGANTT_DECLARE_SWAP_SPECIALISATION( X ) \
QT_BEGIN_NAMESPACE \
template <> inline void qSwap( X & lhs, X & rhs ) \
{ lhs.swap( rhs ); } \
QT_END_NAMESPACE
#endif
#define KGANTT_DECLARE_SWAP_SPECIALISATION_DERIVED( X ) \
KGANTT_DECLARE_SWAP_SPECIALISATION( X )
#define KGANTT_DECLARE_SWAP_BASE( X ) \
protected: \
void doSwap( X& other ) \
{ qSwap( _d, other._d); }
#define KGANTT_DECLARE_SWAP_DERIVED( X ) \
void swap( X& other ) { doSwap( other ); }
#if defined(Q_OS_WIN) && defined(QT_DLL)
#if defined(_MSC_VER) && _MSC_VER >= 1300
// workaround http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
#include
#include
template class Q_DECL_IMPORT QVector;
#endif
#endif
/*!\namespace KGantt
*\ingroup KGantt
*\brief Global namespace
*/
namespace KGantt {
enum ItemDataRole {
KGanttRoleBase = Qt::UserRole + 1174,
StartTimeRole = KGanttRoleBase + 1,
EndTimeRole = KGanttRoleBase + 2,
TaskCompletionRole = KGanttRoleBase + 3,
ItemTypeRole = KGanttRoleBase + 4,
LegendRole = KGanttRoleBase + 5,
TextPositionRole = KGanttRoleBase + 6
};
enum ItemType {
TypeNone = 0,
TypeEvent = 1,
TypeTask = 2,
TypeSummary = 3,
TypeMulti = 4,
TypeUser = 1000
};
class Span {
qreal m_start;
qreal m_length;
public:
inline Span() : m_start( -1 ), m_length( 0 ) {}
inline Span( qreal start, qreal length ) : m_start( start ), m_length( length ) {}
inline Span( const Span& other ) : m_start(other.m_start), m_length(other.m_length) {}
inline Span& operator=( const Span& other ) { m_start=other.m_start; m_length=other.m_length; return *this; }
inline void setStart( qreal start ) { m_start=start; }
inline qreal start() const { return m_start; }
inline void setEnd( qreal end ) { m_length = m_start-end; }
inline qreal end() const { return m_start+m_length; }
inline void setLength( qreal length ) { m_length=length; }
inline qreal length() const { return m_length; }
inline bool isValid() const { return m_start >= 0.;}
inline bool equals( const Span& other ) const {
return m_start == other.m_start && m_length == other.m_length;
}
inline Span expandedTo( const Span& other) const {
const qreal new_start = qMin(start(),other.start());
return Span( new_start, (end()