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
)
add_definitions(-Wall)
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
add_subdirectory(kdchart)
add_subdirectory(massifdata)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -29,14 +29,12 @@
#include <QLayout>
#include <QLayoutItem>
#include <QPen>
#include <QPainter>
#include "KDChartTextAttributes.h"
#include "KDChartMarkerAttributes.h"
QT_BEGIN_NAMESPACE
#include <QPainter>
class KDTextDocument;
QT_END_NAMESPACE
// TODO remove
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 <QPainter>
#include <QVector>
#include <QGridLayout>
#include <QTextDocument>
#include <KDABLibFakes>
QT_BEGIN_NAMESPACE
#include <QGridLayout>
class KDTextDocument;
#include <QTextDocument>
QT_END_NAMESPACE
namespace KDChart {
class AbstractDiagram;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -307,7 +307,7 @@ void ParserPrivate::parseHeapTreeLeaf(const QByteArray& line)
}
if (belowThreshold) {
QByteArray label = belowThreshold->label();
label.replace(oldPlaces, QByteArray::number(places));
label.replace(oldPlaces.toUtf8(), QByteArray::number(places));
belowThreshold->setLabel(label);
}
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
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()) {
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);
QT_END_NAMESPACE
using namespace Massif;