Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 10:22:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

massif-visualizer: fix build against Katie

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-11-30 04:31:15 +00:00
parent e8f538825b
commit 43d4802e1b
49 changed files with 63 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
massif-visualizer/CMakeLists.txt
View file

@ -25,7 +25,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/kdchart/include/KDChart ${CMAKE_CURRENT_SOURCE_DIR}/kdchart/include/KDChart
) )
add_definitions(-Wall) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
add_subdirectory(kdchart) add_subdirectory(kdchart)
add_subdirectory(massifdata) add_subdirectory(massifdata)

1
massif-visualizer/app/charttab.h
View file

@ -28,6 +28,7 @@
#include <QLabel> #include <QLabel>
#include <QModelIndex> #include <QModelIndex>
#include <QPrinter>
class KAction; class KAction;

2
massif-visualizer/app/configdialog.h
View file

@ -25,9 +25,11 @@
#include <KConfigDialog> #include <KConfigDialog>
QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class Config; class Config;
} }
QT_END_NAMESPACE
namespace Massif { namespace Massif {

8
massif-visualizer/kdchart/include/KDChart/KDChartAbstractAreaBase.h
View file

@ -26,18 +26,14 @@
#include <QPointF> #include <QPointF>
#include <QSizeF> #include <QSizeF>
#include <QRectF> #include <QRectF>
#include <QPainter>
#include <QString>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartLayoutItems.h" #include "KDChartLayoutItems.h"
#include "KDChartRelativePosition.h" #include "KDChartRelativePosition.h"
#include "KDChartAbstractAreaBase.h" #include "KDChartAbstractAreaBase.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
#include <QString>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class TextAttributes; class TextAttributes;
class BackgroundAttributes; class BackgroundAttributes;

8
massif-visualizer/kdchart/include/KDChart/KDChartAbstractAxis.h
View file

@ -26,6 +26,8 @@
// #include <QObject> // #include <QObject>
// #include <QRectF> // #include <QRectF>
// #include <QWidget> // #include <QWidget>
#include <QPainter>
#include <QSizeF>
#include "kdchart_export.h" #include "kdchart_export.h"
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
@ -33,12 +35,6 @@
#include "KDChartTextAttributes.h" #include "KDChartTextAttributes.h"
#include "KDChartRulerAttributes.h" #include "KDChartRulerAttributes.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
#include <QSizeF>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class Area; class Area;

6
massif-visualizer/kdchart/include/KDChart/KDChartBarDiagram.h
View file

@ -23,13 +23,11 @@
#ifndef KDCHARTBARDIAGRAM_H #ifndef KDCHARTBARDIAGRAM_H
#define KDCHARTBARDIAGRAM_H #define KDCHARTBARDIAGRAM_H
#include <QPainter>
#include "KDChartAbstractCartesianDiagram.h" #include "KDChartAbstractCartesianDiagram.h"
#include "KDChartBarAttributes.h" #include "KDChartBarAttributes.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class ThreeDBarAttributes; class ThreeDBarAttributes;

3
massif-visualizer/kdchart/include/KDChart/KDChartDiagramObserver.h
View file

@ -28,10 +28,7 @@
#include <QObject> #include <QObject>
#include <QPointer> #include <QPointer>
#include <QModelIndex> #include <QModelIndex>
QT_BEGIN_NAMESPACE
#include <QAbstractItemModel> #include <QAbstractItemModel>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {

5
massif-visualizer/kdchart/include/KDChart/KDChartGridAttributes.h
View file

@ -24,13 +24,10 @@
#define KDCHARTGRIDATTRIBUTES_H #define KDCHARTGRIDATTRIBUTES_H
#include <QMetaType> #include <QMetaType>
#include <QPen>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartEnums.h" #include "KDChartEnums.h"
QT_BEGIN_NAMESPACE
#include <QPen>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

4
massif-visualizer/kdchart/include/KDChart/KDChartLayoutItems.h
View file

@ -29,14 +29,12 @@
#include <QLayout> #include <QLayout>
#include <QLayoutItem> #include <QLayoutItem>
#include <QPen> #include <QPen>
#include <QPainter>
#include "KDChartTextAttributes.h" #include "KDChartTextAttributes.h"
#include "KDChartMarkerAttributes.h" #include "KDChartMarkerAttributes.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
class KDTextDocument; class KDTextDocument;
QT_END_NAMESPACE
// TODO remove // TODO remove
QRectF rotatedRect( const QRectF& pt, qreal rotation ); QRectF rotatedRect( const QRectF& pt, qreal rotation );

8
massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsDiagram.h
View file

@ -23,14 +23,12 @@
#ifndef KDCHARTLEVEYJENNINGSDIAGRAM_H #ifndef KDCHARTLEVEYJENNINGSDIAGRAM_H
#define KDCHARTLEVEYJENNINGSDIAGRAM_H #define KDCHARTLEVEYJENNINGSDIAGRAM_H
#include "KDChartLineDiagram.h"
#include "KDChartLeveyJenningsCoordinatePlane.h"
QT_BEGIN_NAMESPACE
#include <QPainter> #include <QPainter>
#include <QPolygonF> #include <QPolygonF>
#include <QSvgRenderer> #include <QSvgRenderer>
QT_END_NAMESPACE
#include "KDChartLineDiagram.h"
#include "KDChartLeveyJenningsCoordinatePlane.h"
namespace KDChart { namespace KDChart {

5
massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsGridAttributes.h
View file

@ -24,13 +24,10 @@
#define KDCHARTLEVEYJENNINGSGRIDATTRIBUTES_H #define KDCHARTLEVEYJENNINGSGRIDATTRIBUTES_H
#include <QMetaType> #include <QMetaType>
#include <QPen>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartEnums.h" #include "KDChartEnums.h"
QT_BEGIN_NAMESPACE
#include <QPen>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

7
massif-visualizer/kdchart/include/KDChart/KDChartLineDiagram.h
View file

@ -23,15 +23,12 @@
#ifndef KDCHARTLINEDIAGRAM_H #ifndef KDCHARTLINEDIAGRAM_H
#define KDCHARTLINEDIAGRAM_H #define KDCHARTLINEDIAGRAM_H
#include <QPainter>
#include <QPolygonF>
#include "KDChartAbstractCartesianDiagram.h" #include "KDChartAbstractCartesianDiagram.h"
#include "KDChartLineAttributes.h" #include "KDChartLineAttributes.h"
#include "KDChartValueTrackerAttributes.h" #include "KDChartValueTrackerAttributes.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
#include <QPolygonF>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class ThreeDLineAttributes; class ThreeDLineAttributes;

5
massif-visualizer/kdchart/include/KDChart/KDChartMarkerAttributes.h
View file

@ -24,16 +24,13 @@
#define KDCHARTMARKERATTRIBUTES_H #define KDCHARTMARKERATTRIBUTES_H
#include <QMetaType> #include <QMetaType>
#include "KDChartGlobal.h"
QT_BEGIN_NAMESPACE
#include <QColor> #include <QColor>
#include <QSizeF> #include <QSizeF>
#include <QPen> #include <QPen>
#include <QPainterPath> #include <QPainterPath>
#include <QDebug> #include <QDebug>
#include <QMap> #include <QMap>
QT_END_NAMESPACE #include "KDChartGlobal.h"
namespace KDChart { namespace KDChart {

7
massif-visualizer/kdchart/include/KDChart/KDChartMeasure.h
View file

@ -25,6 +25,8 @@
#include <QDebug> #include <QDebug>
#include <QStack> #include <QStack>
#include <QObject>
#include <QPaintDevice>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartEnums.h" #include "KDChartEnums.h"
@ -34,11 +36,6 @@
* *
*/ */
QT_BEGIN_NAMESPACE
#include <QObject>
#include <QPaintDevice>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

5
massif-visualizer/kdchart/include/KDChart/KDChartPaintContext.h
View file

@ -24,11 +24,8 @@
#define PAINTCONTEXT_H #define PAINTCONTEXT_H
#include <QRectF> #include <QRectF>
#include "KDChartGlobal.h"
QT_BEGIN_NAMESPACE
#include <QPainter> #include <QPainter>
QT_END_NAMESPACE #include "KDChartGlobal.h"
namespace KDChart { namespace KDChart {

6
massif-visualizer/kdchart/include/KDChart/KDChartPolarDiagram.h
View file

@ -23,14 +23,10 @@
#ifndef KDCHARTPOLARDIAGRAM_H #ifndef KDCHARTPOLARDIAGRAM_H
#define KDCHARTPOLARDIAGRAM_H #define KDCHARTPOLARDIAGRAM_H
#include <QPolygonF>
#include "KDChartPosition.h" #include "KDChartPosition.h"
#include "KDChartAbstractPolarDiagram.h" #include "KDChartAbstractPolarDiagram.h"
QT_BEGIN_NAMESPACE
#include <QPolygonF>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

9
massif-visualizer/kdchart/include/KDChart/KDChartPosition.h
View file

@ -25,15 +25,12 @@
#include <QDebug> #include <QDebug>
#include <QMetaType> #include <QMetaType>
#include <QCoreApplication>
#include "KDChartGlobal.h"
#include "KDChartEnums.h"
QT_BEGIN_NAMESPACE
#include <QStringList> #include <QStringList>
#include <QByteArray> #include <QByteArray>
#include <QList> #include <QList>
QT_END_NAMESPACE #include <QCoreApplication>
#include "KDChartGlobal.h"
#include "KDChartEnums.h"
namespace KDChart { namespace KDChart {

6
massif-visualizer/kdchart/include/KDChart/KDChartRadarDiagram.h
View file

@ -23,15 +23,11 @@
#ifndef KDCHARTRADARDIAGRAM_H #ifndef KDCHARTRADARDIAGRAM_H
#define KDCHARTRADARDIAGRAM_H #define KDCHARTRADARDIAGRAM_H
#include <QPolygonF>
#include "KDChartPosition.h" #include "KDChartPosition.h"
#include "KDChartPolarDiagram.h" #include "KDChartPolarDiagram.h"
#include "KDChartRadarCoordinatePlane.h" #include "KDChartRadarCoordinatePlane.h"
QT_BEGIN_NAMESPACE
#include <QPolygonF>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

5
massif-visualizer/kdchart/include/KDChart/KDChartRulerAttributes.h
View file

@ -24,13 +24,10 @@
#define KDCHARTRULERATTRIBUTES_H #define KDCHARTRULERATTRIBUTES_H
#include <QMetaType> #include <QMetaType>
#include <QPen>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartEnums.h" #include "KDChartEnums.h"
QT_BEGIN_NAMESPACE
#include <QPen>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

2
massif-visualizer/kdchart/include/KDChart/KDChartTextAttributes.h
View file

@ -28,11 +28,9 @@
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartMeasure.h" #include "KDChartMeasure.h"
QT_BEGIN_NAMESPACE
#include <QPen> #include <QPen>
#include <QFont> #include <QFont>
#include <QTextDocument> #include <QTextDocument>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {

7
massif-visualizer/kdchart/include/KDChart/KDChartWidget.h
View file

@ -26,15 +26,12 @@
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include <QWidget> #include <QWidget>
#include <QVector>
#include <QPair>
#include "KDChartEnums.h" #include "KDChartEnums.h"
#include "KDChartHeaderFooter.h" #include "KDChartHeaderFooter.h"
QT_BEGIN_NAMESPACE
#include <QVector>
#include <QPair>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
// some forward declarations // some forward declarations

3
massif-visualizer/kdchart/include/KDChart/ReverseMapper.h
View file

@ -25,12 +25,9 @@
#include <QModelIndex> #include <QModelIndex>
#include <QHash> #include <QHash>
QT_BEGIN_NAMESPACE
#include <QRectF> #include <QRectF>
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QPolygonF> #include <QPolygonF>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {

5
massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartBarDiagram.h
View file

@ -23,13 +23,10 @@
#ifndef KDCHARTBARDIAGRAM_H #ifndef KDCHARTBARDIAGRAM_H
#define KDCHARTBARDIAGRAM_H #define KDCHARTBARDIAGRAM_H
#include <QPainter>
#include "KDChartAbstractCartesianDiagram.h" #include "KDChartAbstractCartesianDiagram.h"
#include "KDChartBarAttributes.h" #include "KDChartBarAttributes.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class ThreeDBarAttributes; class ThreeDBarAttributes;

4
massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartCartesianDiagramDataCompressor_p.h
View file

@ -41,6 +41,7 @@
#include <QObject> #include <QObject>
#include <QPointer> #include <QPointer>
#include <QModelIndex> #include <QModelIndex>
#include <QAbstractItemModel>
#include "KDChartDataValueAttributes.h" #include "KDChartDataValueAttributes.h"
#include "KDChartModelDataCache_p.h" #include "KDChartModelDataCache_p.h"
@ -48,9 +49,6 @@
#include "kdchart_export.h" #include "kdchart_export.h"
class CartesianDiagramDataCompressorTests; class CartesianDiagramDataCompressorTests;
QT_BEGIN_NAMESPACE
#include <QAbstractItemModel>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {

7
massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram.h
View file

@ -23,14 +23,11 @@
#ifndef KDCHARTLEVEYJENNINGSDIAGRAM_H #ifndef KDCHARTLEVEYJENNINGSDIAGRAM_H
#define KDCHARTLEVEYJENNINGSDIAGRAM_H #define KDCHARTLEVEYJENNINGSDIAGRAM_H
#include "KDChartLineDiagram.h"
#include "KDChartLeveyJenningsCoordinatePlane.h"
QT_BEGIN_NAMESPACE
#include <QPainter> #include <QPainter>
#include <QPolygonF> #include <QPolygonF>
#include <QSvgRenderer> #include <QSvgRenderer>
QT_END_NAMESPACE #include "KDChartLineDiagram.h"
#include "KDChartLeveyJenningsCoordinatePlane.h"
namespace KDChart { namespace KDChart {

5
massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram_p.h
View file

@ -35,16 +35,13 @@
// //
#include <QDateTime> #include <QDateTime>
#include <QSvgRenderer>
#include "KDChartThreeDLineAttributes.h" #include "KDChartThreeDLineAttributes.h"
#include "KDChartLineDiagram_p.h" #include "KDChartLineDiagram_p.h"
#include <KDABLibFakes> #include <KDABLibFakes>
QT_BEGIN_NAMESPACE
#include <QSvgRenderer>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class PaintContext; class PaintContext;

5
massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsGridAttributes.h
View file

@ -24,13 +24,10 @@
#define KDCHARTLEVEYJENNINGSGRIDATTRIBUTES_H #define KDCHARTLEVEYJENNINGSGRIDATTRIBUTES_H
#include <QMetaType> #include <QMetaType>
#include <QPen>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartEnums.h" #include "KDChartEnums.h"
QT_BEGIN_NAMESPACE
#include <QPen>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

7
massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLineDiagram.h
View file

@ -23,15 +23,12 @@
#ifndef KDCHARTLINEDIAGRAM_H #ifndef KDCHARTLINEDIAGRAM_H
#define KDCHARTLINEDIAGRAM_H #define KDCHARTLINEDIAGRAM_H
#include <QPainter>
#include <QPolygonF>
#include "KDChartAbstractCartesianDiagram.h" #include "KDChartAbstractCartesianDiagram.h"
#include "KDChartLineAttributes.h" #include "KDChartLineAttributes.h"
#include "KDChartValueTrackerAttributes.h" #include "KDChartValueTrackerAttributes.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
#include <QPolygonF>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class ThreeDLineAttributes; class ThreeDLineAttributes;

1
massif-visualizer/kdchart/src/KDChart/Cartesian/PaintingHelpers_p.h
View file

@ -28,7 +28,6 @@
#include <QPointF> #include <QPointF>
#include <QVector> #include <QVector>
#include <QBrush> #include <QBrush>
#include <QModelIndex> #include <QModelIndex>
#include <QPen> #include <QPen>

8
massif-visualizer/kdchart/src/KDChart/KDChartAbstractAreaBase.h
View file

@ -26,18 +26,14 @@
#include <QPointF> #include <QPointF>
#include <QSizeF> #include <QSizeF>
#include <QRectF> #include <QRectF>
#include <QPainter>
#include <QString>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartLayoutItems.h" #include "KDChartLayoutItems.h"
#include "KDChartRelativePosition.h" #include "KDChartRelativePosition.h"
#include "KDChartAbstractAreaBase.h" #include "KDChartAbstractAreaBase.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
#include <QString>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class TextAttributes; class TextAttributes;
class BackgroundAttributes; class BackgroundAttributes;

8
massif-visualizer/kdchart/src/KDChart/KDChartAbstractAxis.h
View file

@ -26,6 +26,8 @@
// #include <QObject> // #include <QObject>
// #include <QRectF> // #include <QRectF>
// #include <QWidget> // #include <QWidget>
#include <QPainter>
#include <QSizeF>
#include "kdchart_export.h" #include "kdchart_export.h"
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
@ -33,12 +35,6 @@
#include "KDChartTextAttributes.h" #include "KDChartTextAttributes.h"
#include "KDChartRulerAttributes.h" #include "KDChartRulerAttributes.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
#include <QSizeF>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class Area; class Area;

3
massif-visualizer/kdchart/src/KDChart/KDChartAbstractCoordinatePlane_p.h
View file

@ -43,10 +43,7 @@
#include <KDABLibFakes> #include <KDABLibFakes>
#include <QStack> #include <QStack>
QT_BEGIN_NAMESPACE
#include <QRubberBand> #include <QRubberBand>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {

3
massif-visualizer/kdchart/src/KDChart/KDChartDiagramObserver.h
View file

@ -28,10 +28,7 @@
#include <QObject> #include <QObject>
#include <QPointer> #include <QPointer>
#include <QModelIndex> #include <QModelIndex>
QT_BEGIN_NAMESPACE
#include <QAbstractItemModel> #include <QAbstractItemModel>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {

5
massif-visualizer/kdchart/src/KDChart/KDChartGridAttributes.h
View file

@ -24,13 +24,10 @@
#define KDCHARTGRIDATTRIBUTES_H #define KDCHARTGRIDATTRIBUTES_H
#include <QMetaType> #include <QMetaType>
#include <QPen>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartEnums.h" #include "KDChartEnums.h"
QT_BEGIN_NAMESPACE
#include <QPen>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

4
massif-visualizer/kdchart/src/KDChart/KDChartLayoutItems.h
View file

@ -29,14 +29,12 @@
#include <QLayout> #include <QLayout>
#include <QLayoutItem> #include <QLayoutItem>
#include <QPen> #include <QPen>
#include <QPainter>
#include "KDChartTextAttributes.h" #include "KDChartTextAttributes.h"
#include "KDChartMarkerAttributes.h" #include "KDChartMarkerAttributes.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
class KDTextDocument; class KDTextDocument;
QT_END_NAMESPACE
// TODO remove // TODO remove
QRectF rotatedRect( const QRectF& pt, qreal rotation ); QRectF rotatedRect( const QRectF& pt, qreal rotation );

6
massif-visualizer/kdchart/src/KDChart/KDChartLegend_p.h
View file

@ -43,14 +43,12 @@
#include <QAbstractTextDocumentLayout> #include <QAbstractTextDocumentLayout>
#include <QPainter> #include <QPainter>
#include <QVector> #include <QVector>
#include <QGridLayout>
#include <QTextDocument>
#include <KDABLibFakes> #include <KDABLibFakes>
QT_BEGIN_NAMESPACE
#include <QGridLayout>
class KDTextDocument; class KDTextDocument;
#include <QTextDocument>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
class AbstractDiagram; class AbstractDiagram;

5
massif-visualizer/kdchart/src/KDChart/KDChartMarkerAttributes.h
View file

@ -24,16 +24,13 @@
#define KDCHARTMARKERATTRIBUTES_H #define KDCHARTMARKERATTRIBUTES_H
#include <QMetaType> #include <QMetaType>
#include "KDChartGlobal.h"
QT_BEGIN_NAMESPACE
#include <QColor> #include <QColor>
#include <QSizeF> #include <QSizeF>
#include <QPen> #include <QPen>
#include <QPainterPath> #include <QPainterPath>
#include <QDebug> #include <QDebug>
#include <QMap> #include <QMap>
QT_END_NAMESPACE #include "KDChartGlobal.h"
namespace KDChart { namespace KDChart {

7
massif-visualizer/kdchart/src/KDChart/KDChartMeasure.h
View file

@ -25,6 +25,8 @@
#include <QDebug> #include <QDebug>
#include <QStack> #include <QStack>
#include <QObject>
#include <QPaintDevice>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartEnums.h" #include "KDChartEnums.h"
@ -34,11 +36,6 @@
* *
*/ */
QT_BEGIN_NAMESPACE
#include <QObject>
#include <QPaintDevice>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

5
massif-visualizer/kdchart/src/KDChart/KDChartModelDataCache_p.h
View file

@ -28,13 +28,10 @@
#include <QObject> #include <QObject>
#include <QModelIndex> #include <QModelIndex>
#include <QVector> #include <QVector>
#include <QAbstractItemModel>
#include "kdchart_export.h" #include "kdchart_export.h"
QT_BEGIN_NAMESPACE
#include <QAbstractItemModel>
QT_END_NAMESPACE
namespace KDChart namespace KDChart
{ {
namespace ModelDataCachePrivate namespace ModelDataCachePrivate

5
massif-visualizer/kdchart/src/KDChart/KDChartPaintContext.h
View file

@ -24,11 +24,8 @@
#define PAINTCONTEXT_H #define PAINTCONTEXT_H
#include <QRectF> #include <QRectF>
#include "KDChartGlobal.h"
QT_BEGIN_NAMESPACE
#include <QPainter> #include <QPainter>
QT_END_NAMESPACE #include "KDChartGlobal.h"
namespace KDChart { namespace KDChart {

7
massif-visualizer/kdchart/src/KDChart/KDChartPosition.h
View file

@ -26,14 +26,11 @@
#include <QDebug> #include <QDebug>
#include <QMetaType> #include <QMetaType>
#include <QCoreApplication> #include <QCoreApplication>
#include "KDChartGlobal.h"
#include "KDChartEnums.h"
QT_BEGIN_NAMESPACE
#include <QStringList> #include <QStringList>
#include <QByteArray> #include <QByteArray>
#include <QList> #include <QList>
QT_END_NAMESPACE #include "KDChartGlobal.h"
#include "KDChartEnums.h"
namespace KDChart { namespace KDChart {

5
massif-visualizer/kdchart/src/KDChart/KDChartRulerAttributes.h
View file

@ -24,13 +24,10 @@
#define KDCHARTRULERATTRIBUTES_H #define KDCHARTRULERATTRIBUTES_H
#include <QMetaType> #include <QMetaType>
#include <QPen>
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include "KDChartEnums.h" #include "KDChartEnums.h"
QT_BEGIN_NAMESPACE
#include <QPen>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
/** /**

7
massif-visualizer/kdchart/src/KDChart/KDChartTextAttributes.h
View file

@ -25,14 +25,11 @@
#include <QDebug> #include <QDebug>
#include <QMetaType> #include <QMetaType>
#include "KDChartGlobal.h"
#include "KDChartMeasure.h"
QT_BEGIN_NAMESPACE
#include <QPen> #include <QPen>
#include <QFont> #include <QFont>
#include <QTextDocument> #include <QTextDocument>
QT_END_NAMESPACE #include "KDChartGlobal.h"
#include "KDChartMeasure.h"
namespace KDChart { namespace KDChart {

7
massif-visualizer/kdchart/src/KDChart/KDChartWidget.h
View file

@ -26,15 +26,12 @@
#include "KDChartGlobal.h" #include "KDChartGlobal.h"
#include <QWidget> #include <QWidget>
#include <QVector>
#include <QPair>
#include "KDChartEnums.h" #include "KDChartEnums.h"
#include "KDChartHeaderFooter.h" #include "KDChartHeaderFooter.h"
QT_BEGIN_NAMESPACE
#include <QVector>
#include <QPair>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {
// some forward declarations // some forward declarations

3
massif-visualizer/kdchart/src/KDChart/ReverseMapper.h
View file

@ -25,12 +25,9 @@
#include <QModelIndex> #include <QModelIndex>
#include <QHash> #include <QHash>
QT_BEGIN_NAMESPACE
#include <QRectF> #include <QRectF>
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QPolygonF> #include <QPolygonF>
QT_END_NAMESPACE
namespace KDChart { namespace KDChart {

1
massif-visualizer/massifdata/parser.cpp
View file

@ -27,6 +27,7 @@
#include "snapshotitem.h" #include "snapshotitem.h"
#include <QtCore/QIODevice> #include <QtCore/QIODevice>
#include <QtCore/QScopedPointer>
using namespace Massif; using namespace Massif;

2
massif-visualizer/massifdata/parserprivate.cpp
View file

@ -307,7 +307,7 @@ void ParserPrivate::parseHeapTreeLeaf(const QByteArray& line)
} }
if (belowThreshold) { if (belowThreshold) {
QByteArray label = belowThreshold->label(); QByteArray label = belowThreshold->label();
label.replace(oldPlaces, QByteArray::number(places)); label.replace(oldPlaces.toUtf8(), QByteArray::number(places));
belowThreshold->setLabel(label); belowThreshold->setLabel(label);
} }
qSort(newChildren.begin(), newChildren.end(), sortLeafsByCost); qSort(newChildren.begin(), newChildren.end(), sortLeafsByCost);

2
massif-visualizer/visualizer/detailedcostmodel.cpp
View file

@ -118,7 +118,7 @@ void DetailedCostModel::setSource(const FileData* data)
} }
// ugh, yet another bad usage of QList in Qt's API // ugh, yet another bad usage of QList in Qt's API
m_columns = sortColumnMap.values().toVector(); m_columns = sortColumnMap.values().toVector();
QAlgorithmsPrivate::qReverse(m_columns.begin(), m_columns.end()); std::reverse(m_columns.begin(), m_columns.end());
if (m_rows.isEmpty()) { if (m_rows.isEmpty()) {
return; return;

2
massif-visualizer/visualizer/dotgraphgenerator.cpp
View file

@ -52,7 +52,9 @@ struct GraphNode {
} }
QT_BEGIN_NAMESPACE
Q_DECLARE_TYPEINFO(Massif::GraphNode, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(Massif::GraphNode, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
using namespace Massif; using namespace Massif;