diff --git a/Makefile b/Makefile index f346568..da3541f 100644 --- a/Makefile +++ b/Makefile @@ -23,17 +23,17 @@ MOC_HEADERS=$(shell find src/view -name '*.hpp' -type f | tr '\n' ' ') MOCS=$(MOC_HEADERS:.hpp=.objs) MOCS_OBJS=$(MOC_HEADERS:.hpp=.moc) -CXXFLAGS+=-Ilibkdchart/include -Ilibkdchart/src -Ilibkdchart/kdablibfakes/include +CXXFLAGS+=-Ilib/libkdchart/include -Ilib/libkdchart/src -Ilib/libkdchart/kdablibfakes/include CXXFLAGS+=-DKDCHART_BUILD_KDCHART_LIB -KDCHART_SOURCES=$(shell find libkdchart/src -name '*.cpp' -type f | tr '\n' ' ') +KDCHART_SOURCES=$(shell find lib/libkdchart/src -name '*.cpp' -type f | tr '\n' ' ') KDCHART_OBJS=$(KDCHART_SOURCES:.cpp=.o) -UI_CHARTSELECTOR=libkdchart/src/ui_KDChartDatasetSelector.h -KDCHART_MOC_HEADERS=$(shell find libkdchart/src -name '*.h' -type f | tr '\n' ' ') +UI_CHARTSELECTOR=lib/libkdchart/src/ui_KDChartDatasetSelector.h +KDCHART_MOC_HEADERS=$(shell find lib/libkdchart/src -name '*.h' -type f | tr '\n' ' ') KDCHART_MOCS=$(KDCHART_MOC_HEADERS:.h=.objs) KDCHART_MOCS_OBJS=$(KDCHART_MOC_HEADERS:.h=.moc) -LDFLAGS+=libkdchart.a +LDFLAGS+=lib/libkdchart.a -all: mojito libkdchart.a kc +all: mojito lib/libkdchart.a kc clean_all: clean clean_libkdchart @@ -61,18 +61,18 @@ mojito : $(MOCS_OBJS) $(KDCHART_MOCS_OBJS) kc: $(MOCS) $(OBJS) $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) -$(UI_CHARTSELECTOR): libkdchart/src/KDChartDatasetSelector.ui +$(UI_CHARTSELECTOR): lib/libkdchart/src/KDChartDatasetSelector.ui uic $< > $(UI_CHARTSELECTOR) sed s/KDCHARTDATASETSELECTOR_H/UI_KDCHARTDATASETSELECTOR_H/g -i $(UI_CHARTSELECTOR) -libkdchart.a: $(UI_CHARTSELECTOR) $(KDCHART_MOCS) $(KDCHART_OBJS) - ar rcu libkdchart.a $(KDCHART_MOCS) $(KDCHART_OBJS) +lib/libkdchart.a: $(UI_CHARTSELECTOR) $(KDCHART_MOCS) $(KDCHART_OBJS) + ar rcu lib/libkdchart.a $(KDCHART_MOCS) $(KDCHART_OBJS) clean_libkdchart: - rm -rf libkdchart.a - find libkdchart -name '*.o' -delete - find libkdchart -type f -name '*.moc' -delete - find libkdchart -type f -name '*.objs' -delete + rm -rf lib/libkdchart.a + find lib/libkdchart -name '*.o' -delete + find lib/libkdchart -type f -name '*.moc' -delete + find lib/libkdchart -type f -name '*.objs' -delete generate_locales: ./tools/generate_locales.sh diff --git a/libkdchart/Doxyfile b/lib/libkdchart/Doxyfile similarity index 100% rename from libkdchart/Doxyfile rename to lib/libkdchart/Doxyfile diff --git a/libkdchart/LICENSE.GPL b/lib/libkdchart/LICENSE.GPL similarity index 100% rename from libkdchart/LICENSE.GPL rename to lib/libkdchart/LICENSE.GPL diff --git a/libkdchart/README.txt b/lib/libkdchart/README.txt similarity index 100% rename from libkdchart/README.txt rename to lib/libkdchart/README.txt diff --git a/libkdchart/include/KDChartAbstractAxis b/lib/libkdchart/include/KDChartAbstractAxis similarity index 100% rename from libkdchart/include/KDChartAbstractAxis rename to lib/libkdchart/include/KDChartAbstractAxis diff --git a/libkdchart/include/KDChartAbstractCartesianDiagram b/lib/libkdchart/include/KDChartAbstractCartesianDiagram similarity index 100% rename from libkdchart/include/KDChartAbstractCartesianDiagram rename to lib/libkdchart/include/KDChartAbstractCartesianDiagram diff --git a/libkdchart/include/KDChartAbstractCoordinatePlane b/lib/libkdchart/include/KDChartAbstractCoordinatePlane similarity index 100% rename from libkdchart/include/KDChartAbstractCoordinatePlane rename to lib/libkdchart/include/KDChartAbstractCoordinatePlane diff --git a/libkdchart/include/KDChartAbstractDiagram b/lib/libkdchart/include/KDChartAbstractDiagram similarity index 100% rename from libkdchart/include/KDChartAbstractDiagram rename to lib/libkdchart/include/KDChartAbstractDiagram diff --git a/libkdchart/include/KDChartAbstractPieDiagram b/lib/libkdchart/include/KDChartAbstractPieDiagram similarity index 100% rename from libkdchart/include/KDChartAbstractPieDiagram rename to lib/libkdchart/include/KDChartAbstractPieDiagram diff --git a/libkdchart/include/KDChartAbstractPolarDiagram b/lib/libkdchart/include/KDChartAbstractPolarDiagram similarity index 100% rename from libkdchart/include/KDChartAbstractPolarDiagram rename to lib/libkdchart/include/KDChartAbstractPolarDiagram diff --git a/libkdchart/include/KDChartAbstractProxyModel b/lib/libkdchart/include/KDChartAbstractProxyModel similarity index 100% rename from libkdchart/include/KDChartAbstractProxyModel rename to lib/libkdchart/include/KDChartAbstractProxyModel diff --git a/libkdchart/include/KDChartAbstractTernaryDiagram b/lib/libkdchart/include/KDChartAbstractTernaryDiagram similarity index 100% rename from libkdchart/include/KDChartAbstractTernaryDiagram rename to lib/libkdchart/include/KDChartAbstractTernaryDiagram diff --git a/libkdchart/include/KDChartAbstractThreeDAttributes b/lib/libkdchart/include/KDChartAbstractThreeDAttributes similarity index 100% rename from libkdchart/include/KDChartAbstractThreeDAttributes rename to lib/libkdchart/include/KDChartAbstractThreeDAttributes diff --git a/libkdchart/include/KDChartAttributesModel b/lib/libkdchart/include/KDChartAttributesModel similarity index 100% rename from libkdchart/include/KDChartAttributesModel rename to lib/libkdchart/include/KDChartAttributesModel diff --git a/libkdchart/include/KDChartBackgroundAttributes b/lib/libkdchart/include/KDChartBackgroundAttributes similarity index 100% rename from libkdchart/include/KDChartBackgroundAttributes rename to lib/libkdchart/include/KDChartBackgroundAttributes diff --git a/libkdchart/include/KDChartBarAttributes b/lib/libkdchart/include/KDChartBarAttributes similarity index 100% rename from libkdchart/include/KDChartBarAttributes rename to lib/libkdchart/include/KDChartBarAttributes diff --git a/libkdchart/include/KDChartBarDiagram b/lib/libkdchart/include/KDChartBarDiagram similarity index 100% rename from libkdchart/include/KDChartBarDiagram rename to lib/libkdchart/include/KDChartBarDiagram diff --git a/libkdchart/include/KDChartCartesianAxis b/lib/libkdchart/include/KDChartCartesianAxis similarity index 100% rename from libkdchart/include/KDChartCartesianAxis rename to lib/libkdchart/include/KDChartCartesianAxis diff --git a/libkdchart/include/KDChartCartesianCoordinatePlane b/lib/libkdchart/include/KDChartCartesianCoordinatePlane similarity index 100% rename from libkdchart/include/KDChartCartesianCoordinatePlane rename to lib/libkdchart/include/KDChartCartesianCoordinatePlane diff --git a/libkdchart/include/KDChartChart b/lib/libkdchart/include/KDChartChart similarity index 100% rename from libkdchart/include/KDChartChart rename to lib/libkdchart/include/KDChartChart diff --git a/libkdchart/include/KDChartDataValueAttributes b/lib/libkdchart/include/KDChartDataValueAttributes similarity index 100% rename from libkdchart/include/KDChartDataValueAttributes rename to lib/libkdchart/include/KDChartDataValueAttributes diff --git a/libkdchart/include/KDChartDatasetProxyModel b/lib/libkdchart/include/KDChartDatasetProxyModel similarity index 100% rename from libkdchart/include/KDChartDatasetProxyModel rename to lib/libkdchart/include/KDChartDatasetProxyModel diff --git a/libkdchart/include/KDChartDatasetSelector b/lib/libkdchart/include/KDChartDatasetSelector similarity index 100% rename from libkdchart/include/KDChartDatasetSelector rename to lib/libkdchart/include/KDChartDatasetSelector diff --git a/libkdchart/include/KDChartDiagramObserver b/lib/libkdchart/include/KDChartDiagramObserver similarity index 100% rename from libkdchart/include/KDChartDiagramObserver rename to lib/libkdchart/include/KDChartDiagramObserver diff --git a/libkdchart/include/KDChartEnums b/lib/libkdchart/include/KDChartEnums similarity index 100% rename from libkdchart/include/KDChartEnums rename to lib/libkdchart/include/KDChartEnums diff --git a/libkdchart/include/KDChartFrameAttributes b/lib/libkdchart/include/KDChartFrameAttributes similarity index 100% rename from libkdchart/include/KDChartFrameAttributes rename to lib/libkdchart/include/KDChartFrameAttributes diff --git a/libkdchart/include/KDChartGlobal b/lib/libkdchart/include/KDChartGlobal similarity index 100% rename from libkdchart/include/KDChartGlobal rename to lib/libkdchart/include/KDChartGlobal diff --git a/libkdchart/include/KDChartGridAttributes b/lib/libkdchart/include/KDChartGridAttributes similarity index 100% rename from libkdchart/include/KDChartGridAttributes rename to lib/libkdchart/include/KDChartGridAttributes diff --git a/libkdchart/include/KDChartHeaderFooter b/lib/libkdchart/include/KDChartHeaderFooter similarity index 100% rename from libkdchart/include/KDChartHeaderFooter rename to lib/libkdchart/include/KDChartHeaderFooter diff --git a/libkdchart/include/KDChartLegend b/lib/libkdchart/include/KDChartLegend similarity index 100% rename from libkdchart/include/KDChartLegend rename to lib/libkdchart/include/KDChartLegend diff --git a/libkdchart/include/KDChartLeveyJenningsAxis b/lib/libkdchart/include/KDChartLeveyJenningsAxis similarity index 100% rename from libkdchart/include/KDChartLeveyJenningsAxis rename to lib/libkdchart/include/KDChartLeveyJenningsAxis diff --git a/libkdchart/include/KDChartLeveyJenningsCoordinatePlane b/lib/libkdchart/include/KDChartLeveyJenningsCoordinatePlane similarity index 100% rename from libkdchart/include/KDChartLeveyJenningsCoordinatePlane rename to lib/libkdchart/include/KDChartLeveyJenningsCoordinatePlane diff --git a/libkdchart/include/KDChartLeveyJenningsDiagram b/lib/libkdchart/include/KDChartLeveyJenningsDiagram similarity index 100% rename from libkdchart/include/KDChartLeveyJenningsDiagram rename to lib/libkdchart/include/KDChartLeveyJenningsDiagram diff --git a/libkdchart/include/KDChartLeveyJenningsGrid b/lib/libkdchart/include/KDChartLeveyJenningsGrid similarity index 100% rename from libkdchart/include/KDChartLeveyJenningsGrid rename to lib/libkdchart/include/KDChartLeveyJenningsGrid diff --git a/libkdchart/include/KDChartLeveyJenningsGridAttributes b/lib/libkdchart/include/KDChartLeveyJenningsGridAttributes similarity index 100% rename from libkdchart/include/KDChartLeveyJenningsGridAttributes rename to lib/libkdchart/include/KDChartLeveyJenningsGridAttributes diff --git a/libkdchart/include/KDChartLineAttributes b/lib/libkdchart/include/KDChartLineAttributes similarity index 100% rename from libkdchart/include/KDChartLineAttributes rename to lib/libkdchart/include/KDChartLineAttributes diff --git a/libkdchart/include/KDChartLineDiagram b/lib/libkdchart/include/KDChartLineDiagram similarity index 100% rename from libkdchart/include/KDChartLineDiagram rename to lib/libkdchart/include/KDChartLineDiagram diff --git a/libkdchart/include/KDChartMarkerAttributes b/lib/libkdchart/include/KDChartMarkerAttributes similarity index 100% rename from libkdchart/include/KDChartMarkerAttributes rename to lib/libkdchart/include/KDChartMarkerAttributes diff --git a/libkdchart/include/KDChartMeasure b/lib/libkdchart/include/KDChartMeasure similarity index 100% rename from libkdchart/include/KDChartMeasure rename to lib/libkdchart/include/KDChartMeasure diff --git a/libkdchart/include/KDChartPaintContext b/lib/libkdchart/include/KDChartPaintContext similarity index 100% rename from libkdchart/include/KDChartPaintContext rename to lib/libkdchart/include/KDChartPaintContext diff --git a/libkdchart/include/KDChartPalette b/lib/libkdchart/include/KDChartPalette similarity index 100% rename from libkdchart/include/KDChartPalette rename to lib/libkdchart/include/KDChartPalette diff --git a/libkdchart/include/KDChartPieAttributes b/lib/libkdchart/include/KDChartPieAttributes similarity index 100% rename from libkdchart/include/KDChartPieAttributes rename to lib/libkdchart/include/KDChartPieAttributes diff --git a/libkdchart/include/KDChartPieDiagram b/lib/libkdchart/include/KDChartPieDiagram similarity index 100% rename from libkdchart/include/KDChartPieDiagram rename to lib/libkdchart/include/KDChartPieDiagram diff --git a/libkdchart/include/KDChartPlotter b/lib/libkdchart/include/KDChartPlotter similarity index 100% rename from libkdchart/include/KDChartPlotter rename to lib/libkdchart/include/KDChartPlotter diff --git a/libkdchart/include/KDChartPolarCoordinatePlane b/lib/libkdchart/include/KDChartPolarCoordinatePlane similarity index 100% rename from libkdchart/include/KDChartPolarCoordinatePlane rename to lib/libkdchart/include/KDChartPolarCoordinatePlane diff --git a/libkdchart/include/KDChartPolarDiagram b/lib/libkdchart/include/KDChartPolarDiagram similarity index 100% rename from libkdchart/include/KDChartPolarDiagram rename to lib/libkdchart/include/KDChartPolarDiagram diff --git a/libkdchart/include/KDChartPosition b/lib/libkdchart/include/KDChartPosition similarity index 100% rename from libkdchart/include/KDChartPosition rename to lib/libkdchart/include/KDChartPosition diff --git a/libkdchart/include/KDChartRelativePosition b/lib/libkdchart/include/KDChartRelativePosition similarity index 100% rename from libkdchart/include/KDChartRelativePosition rename to lib/libkdchart/include/KDChartRelativePosition diff --git a/libkdchart/include/KDChartRingDiagram b/lib/libkdchart/include/KDChartRingDiagram similarity index 100% rename from libkdchart/include/KDChartRingDiagram rename to lib/libkdchart/include/KDChartRingDiagram diff --git a/libkdchart/include/KDChartRulerAttributes b/lib/libkdchart/include/KDChartRulerAttributes similarity index 100% rename from libkdchart/include/KDChartRulerAttributes rename to lib/libkdchart/include/KDChartRulerAttributes diff --git a/libkdchart/include/KDChartStockBarAttributes b/lib/libkdchart/include/KDChartStockBarAttributes similarity index 100% rename from libkdchart/include/KDChartStockBarAttributes rename to lib/libkdchart/include/KDChartStockBarAttributes diff --git a/libkdchart/include/KDChartStockDiagram b/lib/libkdchart/include/KDChartStockDiagram similarity index 100% rename from libkdchart/include/KDChartStockDiagram rename to lib/libkdchart/include/KDChartStockDiagram diff --git a/libkdchart/include/KDChartTernaryAxis b/lib/libkdchart/include/KDChartTernaryAxis similarity index 100% rename from libkdchart/include/KDChartTernaryAxis rename to lib/libkdchart/include/KDChartTernaryAxis diff --git a/libkdchart/include/KDChartTernaryCoordinatePlane b/lib/libkdchart/include/KDChartTernaryCoordinatePlane similarity index 100% rename from libkdchart/include/KDChartTernaryCoordinatePlane rename to lib/libkdchart/include/KDChartTernaryCoordinatePlane diff --git a/libkdchart/include/KDChartTernaryLineDiagram b/lib/libkdchart/include/KDChartTernaryLineDiagram similarity index 100% rename from libkdchart/include/KDChartTernaryLineDiagram rename to lib/libkdchart/include/KDChartTernaryLineDiagram diff --git a/libkdchart/include/KDChartTernaryPointDiagram b/lib/libkdchart/include/KDChartTernaryPointDiagram similarity index 100% rename from libkdchart/include/KDChartTernaryPointDiagram rename to lib/libkdchart/include/KDChartTernaryPointDiagram diff --git a/libkdchart/include/KDChartTextAttributes b/lib/libkdchart/include/KDChartTextAttributes similarity index 100% rename from libkdchart/include/KDChartTextAttributes rename to lib/libkdchart/include/KDChartTextAttributes diff --git a/libkdchart/include/KDChartThreeDBarAttributes b/lib/libkdchart/include/KDChartThreeDBarAttributes similarity index 100% rename from libkdchart/include/KDChartThreeDBarAttributes rename to lib/libkdchart/include/KDChartThreeDBarAttributes diff --git a/libkdchart/include/KDChartThreeDLineAttributes b/lib/libkdchart/include/KDChartThreeDLineAttributes similarity index 100% rename from libkdchart/include/KDChartThreeDLineAttributes rename to lib/libkdchart/include/KDChartThreeDLineAttributes diff --git a/libkdchart/include/KDChartThreeDPieAttributes b/lib/libkdchart/include/KDChartThreeDPieAttributes similarity index 100% rename from libkdchart/include/KDChartThreeDPieAttributes rename to lib/libkdchart/include/KDChartThreeDPieAttributes diff --git a/libkdchart/include/KDChartValueTrackerAttributes b/lib/libkdchart/include/KDChartValueTrackerAttributes similarity index 100% rename from libkdchart/include/KDChartValueTrackerAttributes rename to lib/libkdchart/include/KDChartValueTrackerAttributes diff --git a/libkdchart/include/KDChartWidget b/lib/libkdchart/include/KDChartWidget similarity index 100% rename from libkdchart/include/KDChartWidget rename to lib/libkdchart/include/KDChartWidget diff --git a/libkdchart/include/KDChartZoomParameters b/lib/libkdchart/include/KDChartZoomParameters similarity index 100% rename from libkdchart/include/KDChartZoomParameters rename to lib/libkdchart/include/KDChartZoomParameters diff --git a/libkdchart/include/KDTextDocument b/lib/libkdchart/include/KDTextDocument similarity index 100% rename from libkdchart/include/KDTextDocument rename to lib/libkdchart/include/KDTextDocument diff --git a/libkdchart/include/ui_KDChartDatasetSelector.h b/lib/libkdchart/include/ui_KDChartDatasetSelector.h similarity index 100% rename from libkdchart/include/ui_KDChartDatasetSelector.h rename to lib/libkdchart/include/ui_KDChartDatasetSelector.h diff --git a/libkdchart/kdablibfakes/include/KDABLibFakes b/lib/libkdchart/kdablibfakes/include/KDABLibFakes similarity index 100% rename from libkdchart/kdablibfakes/include/KDABLibFakes rename to lib/libkdchart/kdablibfakes/include/KDABLibFakes diff --git a/libkdchart/kdablibfakes/src/KDABLibFakes.h b/lib/libkdchart/kdablibfakes/src/KDABLibFakes.h similarity index 100% rename from libkdchart/kdablibfakes/src/KDABLibFakes.h rename to lib/libkdchart/kdablibfakes/src/KDABLibFakes.h diff --git a/libkdchart/src/CartesianCoordinateTransformation.h b/lib/libkdchart/src/CartesianCoordinateTransformation.h similarity index 100% rename from libkdchart/src/CartesianCoordinateTransformation.h rename to lib/libkdchart/src/CartesianCoordinateTransformation.h diff --git a/libkdchart/src/KDChartAbstractArea.cpp b/lib/libkdchart/src/KDChartAbstractArea.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractArea.cpp rename to lib/libkdchart/src/KDChartAbstractArea.cpp diff --git a/libkdchart/src/KDChartAbstractArea.h b/lib/libkdchart/src/KDChartAbstractArea.h similarity index 100% rename from libkdchart/src/KDChartAbstractArea.h rename to lib/libkdchart/src/KDChartAbstractArea.h diff --git a/libkdchart/src/KDChartAbstractAreaBase.cpp b/lib/libkdchart/src/KDChartAbstractAreaBase.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractAreaBase.cpp rename to lib/libkdchart/src/KDChartAbstractAreaBase.cpp diff --git a/libkdchart/src/KDChartAbstractAreaBase.h b/lib/libkdchart/src/KDChartAbstractAreaBase.h similarity index 100% rename from libkdchart/src/KDChartAbstractAreaBase.h rename to lib/libkdchart/src/KDChartAbstractAreaBase.h diff --git a/libkdchart/src/KDChartAbstractAreaBase_p.h b/lib/libkdchart/src/KDChartAbstractAreaBase_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractAreaBase_p.h rename to lib/libkdchart/src/KDChartAbstractAreaBase_p.h diff --git a/libkdchart/src/KDChartAbstractAreaWidget.cpp b/lib/libkdchart/src/KDChartAbstractAreaWidget.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractAreaWidget.cpp rename to lib/libkdchart/src/KDChartAbstractAreaWidget.cpp diff --git a/libkdchart/src/KDChartAbstractAreaWidget.h b/lib/libkdchart/src/KDChartAbstractAreaWidget.h similarity index 100% rename from libkdchart/src/KDChartAbstractAreaWidget.h rename to lib/libkdchart/src/KDChartAbstractAreaWidget.h diff --git a/libkdchart/src/KDChartAbstractAreaWidget_p.h b/lib/libkdchart/src/KDChartAbstractAreaWidget_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractAreaWidget_p.h rename to lib/libkdchart/src/KDChartAbstractAreaWidget_p.h diff --git a/libkdchart/src/KDChartAbstractArea_p.h b/lib/libkdchart/src/KDChartAbstractArea_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractArea_p.h rename to lib/libkdchart/src/KDChartAbstractArea_p.h diff --git a/libkdchart/src/KDChartAbstractAxis.cpp b/lib/libkdchart/src/KDChartAbstractAxis.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractAxis.cpp rename to lib/libkdchart/src/KDChartAbstractAxis.cpp diff --git a/libkdchart/src/KDChartAbstractAxis.h b/lib/libkdchart/src/KDChartAbstractAxis.h similarity index 100% rename from libkdchart/src/KDChartAbstractAxis.h rename to lib/libkdchart/src/KDChartAbstractAxis.h diff --git a/libkdchart/src/KDChartAbstractAxis_p.h b/lib/libkdchart/src/KDChartAbstractAxis_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractAxis_p.h rename to lib/libkdchart/src/KDChartAbstractAxis_p.h diff --git a/libkdchart/src/KDChartAbstractCartesianDiagram.cpp b/lib/libkdchart/src/KDChartAbstractCartesianDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractCartesianDiagram.cpp rename to lib/libkdchart/src/KDChartAbstractCartesianDiagram.cpp diff --git a/libkdchart/src/KDChartAbstractCartesianDiagram.h b/lib/libkdchart/src/KDChartAbstractCartesianDiagram.h similarity index 100% rename from libkdchart/src/KDChartAbstractCartesianDiagram.h rename to lib/libkdchart/src/KDChartAbstractCartesianDiagram.h diff --git a/libkdchart/src/KDChartAbstractCartesianDiagram_p.h b/lib/libkdchart/src/KDChartAbstractCartesianDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractCartesianDiagram_p.h rename to lib/libkdchart/src/KDChartAbstractCartesianDiagram_p.h diff --git a/libkdchart/src/KDChartAbstractCoordinatePlane.cpp b/lib/libkdchart/src/KDChartAbstractCoordinatePlane.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractCoordinatePlane.cpp rename to lib/libkdchart/src/KDChartAbstractCoordinatePlane.cpp diff --git a/libkdchart/src/KDChartAbstractCoordinatePlane.h b/lib/libkdchart/src/KDChartAbstractCoordinatePlane.h similarity index 100% rename from libkdchart/src/KDChartAbstractCoordinatePlane.h rename to lib/libkdchart/src/KDChartAbstractCoordinatePlane.h diff --git a/libkdchart/src/KDChartAbstractCoordinatePlane_p.h b/lib/libkdchart/src/KDChartAbstractCoordinatePlane_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractCoordinatePlane_p.h rename to lib/libkdchart/src/KDChartAbstractCoordinatePlane_p.h diff --git a/libkdchart/src/KDChartAbstractDiagram.cpp b/lib/libkdchart/src/KDChartAbstractDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractDiagram.cpp rename to lib/libkdchart/src/KDChartAbstractDiagram.cpp diff --git a/libkdchart/src/KDChartAbstractDiagram.h b/lib/libkdchart/src/KDChartAbstractDiagram.h similarity index 100% rename from libkdchart/src/KDChartAbstractDiagram.h rename to lib/libkdchart/src/KDChartAbstractDiagram.h diff --git a/libkdchart/src/KDChartAbstractDiagram_p.h b/lib/libkdchart/src/KDChartAbstractDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractDiagram_p.h rename to lib/libkdchart/src/KDChartAbstractDiagram_p.h diff --git a/libkdchart/src/KDChartAbstractGrid.cpp b/lib/libkdchart/src/KDChartAbstractGrid.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractGrid.cpp rename to lib/libkdchart/src/KDChartAbstractGrid.cpp diff --git a/libkdchart/src/KDChartAbstractGrid.h b/lib/libkdchart/src/KDChartAbstractGrid.h similarity index 100% rename from libkdchart/src/KDChartAbstractGrid.h rename to lib/libkdchart/src/KDChartAbstractGrid.h diff --git a/libkdchart/src/KDChartAbstractPieDiagram.cpp b/lib/libkdchart/src/KDChartAbstractPieDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractPieDiagram.cpp rename to lib/libkdchart/src/KDChartAbstractPieDiagram.cpp diff --git a/libkdchart/src/KDChartAbstractPieDiagram.h b/lib/libkdchart/src/KDChartAbstractPieDiagram.h similarity index 100% rename from libkdchart/src/KDChartAbstractPieDiagram.h rename to lib/libkdchart/src/KDChartAbstractPieDiagram.h diff --git a/libkdchart/src/KDChartAbstractPieDiagram_p.h b/lib/libkdchart/src/KDChartAbstractPieDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractPieDiagram_p.h rename to lib/libkdchart/src/KDChartAbstractPieDiagram_p.h diff --git a/libkdchart/src/KDChartAbstractPolarDiagram.cpp b/lib/libkdchart/src/KDChartAbstractPolarDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractPolarDiagram.cpp rename to lib/libkdchart/src/KDChartAbstractPolarDiagram.cpp diff --git a/libkdchart/src/KDChartAbstractPolarDiagram.h b/lib/libkdchart/src/KDChartAbstractPolarDiagram.h similarity index 100% rename from libkdchart/src/KDChartAbstractPolarDiagram.h rename to lib/libkdchart/src/KDChartAbstractPolarDiagram.h diff --git a/libkdchart/src/KDChartAbstractPolarDiagram_p.h b/lib/libkdchart/src/KDChartAbstractPolarDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractPolarDiagram_p.h rename to lib/libkdchart/src/KDChartAbstractPolarDiagram_p.h diff --git a/libkdchart/src/KDChartAbstractProxyModel.cpp b/lib/libkdchart/src/KDChartAbstractProxyModel.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractProxyModel.cpp rename to lib/libkdchart/src/KDChartAbstractProxyModel.cpp diff --git a/libkdchart/src/KDChartAbstractProxyModel.h b/lib/libkdchart/src/KDChartAbstractProxyModel.h similarity index 100% rename from libkdchart/src/KDChartAbstractProxyModel.h rename to lib/libkdchart/src/KDChartAbstractProxyModel.h diff --git a/libkdchart/src/KDChartAbstractThreeDAttributes.cpp b/lib/libkdchart/src/KDChartAbstractThreeDAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartAbstractThreeDAttributes.cpp rename to lib/libkdchart/src/KDChartAbstractThreeDAttributes.cpp diff --git a/libkdchart/src/KDChartAbstractThreeDAttributes.h b/lib/libkdchart/src/KDChartAbstractThreeDAttributes.h similarity index 100% rename from libkdchart/src/KDChartAbstractThreeDAttributes.h rename to lib/libkdchart/src/KDChartAbstractThreeDAttributes.h diff --git a/libkdchart/src/KDChartAbstractThreeDAttributes_p.h b/lib/libkdchart/src/KDChartAbstractThreeDAttributes_p.h similarity index 100% rename from libkdchart/src/KDChartAbstractThreeDAttributes_p.h rename to lib/libkdchart/src/KDChartAbstractThreeDAttributes_p.h diff --git a/libkdchart/src/KDChartAttributesModel.cpp b/lib/libkdchart/src/KDChartAttributesModel.cpp similarity index 100% rename from libkdchart/src/KDChartAttributesModel.cpp rename to lib/libkdchart/src/KDChartAttributesModel.cpp diff --git a/libkdchart/src/KDChartAttributesModel.h b/lib/libkdchart/src/KDChartAttributesModel.h similarity index 100% rename from libkdchart/src/KDChartAttributesModel.h rename to lib/libkdchart/src/KDChartAttributesModel.h diff --git a/libkdchart/src/KDChartBackgroundAttributes.cpp b/lib/libkdchart/src/KDChartBackgroundAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartBackgroundAttributes.cpp rename to lib/libkdchart/src/KDChartBackgroundAttributes.cpp diff --git a/libkdchart/src/KDChartBackgroundAttributes.h b/lib/libkdchart/src/KDChartBackgroundAttributes.h similarity index 100% rename from libkdchart/src/KDChartBackgroundAttributes.h rename to lib/libkdchart/src/KDChartBackgroundAttributes.h diff --git a/libkdchart/src/KDChartBarAttributes.cpp b/lib/libkdchart/src/KDChartBarAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartBarAttributes.cpp rename to lib/libkdchart/src/KDChartBarAttributes.cpp diff --git a/libkdchart/src/KDChartBarAttributes.h b/lib/libkdchart/src/KDChartBarAttributes.h similarity index 100% rename from libkdchart/src/KDChartBarAttributes.h rename to lib/libkdchart/src/KDChartBarAttributes.h diff --git a/libkdchart/src/KDChartBarDiagram.cpp b/lib/libkdchart/src/KDChartBarDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartBarDiagram.cpp rename to lib/libkdchart/src/KDChartBarDiagram.cpp diff --git a/libkdchart/src/KDChartBarDiagram.h b/lib/libkdchart/src/KDChartBarDiagram.h similarity index 100% rename from libkdchart/src/KDChartBarDiagram.h rename to lib/libkdchart/src/KDChartBarDiagram.h diff --git a/libkdchart/src/KDChartBarDiagram_p.cpp b/lib/libkdchart/src/KDChartBarDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartBarDiagram_p.cpp rename to lib/libkdchart/src/KDChartBarDiagram_p.cpp diff --git a/libkdchart/src/KDChartBarDiagram_p.h b/lib/libkdchart/src/KDChartBarDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartBarDiagram_p.h rename to lib/libkdchart/src/KDChartBarDiagram_p.h diff --git a/libkdchart/src/KDChartCartesianAxis.cpp b/lib/libkdchart/src/KDChartCartesianAxis.cpp similarity index 100% rename from libkdchart/src/KDChartCartesianAxis.cpp rename to lib/libkdchart/src/KDChartCartesianAxis.cpp diff --git a/libkdchart/src/KDChartCartesianAxis.h b/lib/libkdchart/src/KDChartCartesianAxis.h similarity index 100% rename from libkdchart/src/KDChartCartesianAxis.h rename to lib/libkdchart/src/KDChartCartesianAxis.h diff --git a/libkdchart/src/KDChartCartesianAxis_p.h b/lib/libkdchart/src/KDChartCartesianAxis_p.h similarity index 100% rename from libkdchart/src/KDChartCartesianAxis_p.h rename to lib/libkdchart/src/KDChartCartesianAxis_p.h diff --git a/libkdchart/src/KDChartCartesianCoordinatePlane.cpp b/lib/libkdchart/src/KDChartCartesianCoordinatePlane.cpp similarity index 100% rename from libkdchart/src/KDChartCartesianCoordinatePlane.cpp rename to lib/libkdchart/src/KDChartCartesianCoordinatePlane.cpp diff --git a/libkdchart/src/KDChartCartesianCoordinatePlane.h b/lib/libkdchart/src/KDChartCartesianCoordinatePlane.h similarity index 100% rename from libkdchart/src/KDChartCartesianCoordinatePlane.h rename to lib/libkdchart/src/KDChartCartesianCoordinatePlane.h diff --git a/libkdchart/src/KDChartCartesianCoordinatePlane_p.h b/lib/libkdchart/src/KDChartCartesianCoordinatePlane_p.h similarity index 100% rename from libkdchart/src/KDChartCartesianCoordinatePlane_p.h rename to lib/libkdchart/src/KDChartCartesianCoordinatePlane_p.h diff --git a/libkdchart/src/KDChartCartesianDiagramDataCompressor_p.cpp b/lib/libkdchart/src/KDChartCartesianDiagramDataCompressor_p.cpp similarity index 100% rename from libkdchart/src/KDChartCartesianDiagramDataCompressor_p.cpp rename to lib/libkdchart/src/KDChartCartesianDiagramDataCompressor_p.cpp diff --git a/libkdchart/src/KDChartCartesianDiagramDataCompressor_p.h b/lib/libkdchart/src/KDChartCartesianDiagramDataCompressor_p.h similarity index 100% rename from libkdchart/src/KDChartCartesianDiagramDataCompressor_p.h rename to lib/libkdchart/src/KDChartCartesianDiagramDataCompressor_p.h diff --git a/libkdchart/src/KDChartCartesianGrid.cpp b/lib/libkdchart/src/KDChartCartesianGrid.cpp similarity index 100% rename from libkdchart/src/KDChartCartesianGrid.cpp rename to lib/libkdchart/src/KDChartCartesianGrid.cpp diff --git a/libkdchart/src/KDChartCartesianGrid.h b/lib/libkdchart/src/KDChartCartesianGrid.h similarity index 100% rename from libkdchart/src/KDChartCartesianGrid.h rename to lib/libkdchart/src/KDChartCartesianGrid.h diff --git a/libkdchart/src/KDChartChart.cpp b/lib/libkdchart/src/KDChartChart.cpp similarity index 100% rename from libkdchart/src/KDChartChart.cpp rename to lib/libkdchart/src/KDChartChart.cpp diff --git a/libkdchart/src/KDChartChart.h b/lib/libkdchart/src/KDChartChart.h similarity index 100% rename from libkdchart/src/KDChartChart.h rename to lib/libkdchart/src/KDChartChart.h diff --git a/libkdchart/src/KDChartChart_p.h b/lib/libkdchart/src/KDChartChart_p.h similarity index 100% rename from libkdchart/src/KDChartChart_p.h rename to lib/libkdchart/src/KDChartChart_p.h diff --git a/libkdchart/src/KDChartDataValueAttributes.cpp b/lib/libkdchart/src/KDChartDataValueAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartDataValueAttributes.cpp rename to lib/libkdchart/src/KDChartDataValueAttributes.cpp diff --git a/libkdchart/src/KDChartDataValueAttributes.h b/lib/libkdchart/src/KDChartDataValueAttributes.h similarity index 100% rename from libkdchart/src/KDChartDataValueAttributes.h rename to lib/libkdchart/src/KDChartDataValueAttributes.h diff --git a/libkdchart/src/KDChartDatasetProxyModel.cpp b/lib/libkdchart/src/KDChartDatasetProxyModel.cpp similarity index 100% rename from libkdchart/src/KDChartDatasetProxyModel.cpp rename to lib/libkdchart/src/KDChartDatasetProxyModel.cpp diff --git a/libkdchart/src/KDChartDatasetProxyModel.h b/lib/libkdchart/src/KDChartDatasetProxyModel.h similarity index 100% rename from libkdchart/src/KDChartDatasetProxyModel.h rename to lib/libkdchart/src/KDChartDatasetProxyModel.h diff --git a/libkdchart/src/KDChartDatasetSelector.cpp b/lib/libkdchart/src/KDChartDatasetSelector.cpp similarity index 100% rename from libkdchart/src/KDChartDatasetSelector.cpp rename to lib/libkdchart/src/KDChartDatasetSelector.cpp diff --git a/libkdchart/src/KDChartDatasetSelector.h b/lib/libkdchart/src/KDChartDatasetSelector.h similarity index 100% rename from libkdchart/src/KDChartDatasetSelector.h rename to lib/libkdchart/src/KDChartDatasetSelector.h diff --git a/libkdchart/src/KDChartDatasetSelector.ui b/lib/libkdchart/src/KDChartDatasetSelector.ui similarity index 100% rename from libkdchart/src/KDChartDatasetSelector.ui rename to lib/libkdchart/src/KDChartDatasetSelector.ui diff --git a/libkdchart/src/KDChartDiagramObserver.cpp b/lib/libkdchart/src/KDChartDiagramObserver.cpp similarity index 100% rename from libkdchart/src/KDChartDiagramObserver.cpp rename to lib/libkdchart/src/KDChartDiagramObserver.cpp diff --git a/libkdchart/src/KDChartDiagramObserver.h b/lib/libkdchart/src/KDChartDiagramObserver.h similarity index 100% rename from libkdchart/src/KDChartDiagramObserver.h rename to lib/libkdchart/src/KDChartDiagramObserver.h diff --git a/libkdchart/src/KDChartEnums.h b/lib/libkdchart/src/KDChartEnums.h similarity index 100% rename from libkdchart/src/KDChartEnums.h rename to lib/libkdchart/src/KDChartEnums.h diff --git a/libkdchart/src/KDChartFrameAttributes.cpp b/lib/libkdchart/src/KDChartFrameAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartFrameAttributes.cpp rename to lib/libkdchart/src/KDChartFrameAttributes.cpp diff --git a/libkdchart/src/KDChartFrameAttributes.h b/lib/libkdchart/src/KDChartFrameAttributes.h similarity index 100% rename from libkdchart/src/KDChartFrameAttributes.h rename to lib/libkdchart/src/KDChartFrameAttributes.h diff --git a/libkdchart/src/KDChartGlobal.h b/lib/libkdchart/src/KDChartGlobal.h similarity index 100% rename from libkdchart/src/KDChartGlobal.h rename to lib/libkdchart/src/KDChartGlobal.h diff --git a/libkdchart/src/KDChartGridAttributes.cpp b/lib/libkdchart/src/KDChartGridAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartGridAttributes.cpp rename to lib/libkdchart/src/KDChartGridAttributes.cpp diff --git a/libkdchart/src/KDChartGridAttributes.h b/lib/libkdchart/src/KDChartGridAttributes.h similarity index 100% rename from libkdchart/src/KDChartGridAttributes.h rename to lib/libkdchart/src/KDChartGridAttributes.h diff --git a/libkdchart/src/KDChartHeaderFooter.cpp b/lib/libkdchart/src/KDChartHeaderFooter.cpp similarity index 100% rename from libkdchart/src/KDChartHeaderFooter.cpp rename to lib/libkdchart/src/KDChartHeaderFooter.cpp diff --git a/libkdchart/src/KDChartHeaderFooter.h b/lib/libkdchart/src/KDChartHeaderFooter.h similarity index 100% rename from libkdchart/src/KDChartHeaderFooter.h rename to lib/libkdchart/src/KDChartHeaderFooter.h diff --git a/libkdchart/src/KDChartHeaderFooter_p.h b/lib/libkdchart/src/KDChartHeaderFooter_p.h similarity index 100% rename from libkdchart/src/KDChartHeaderFooter_p.h rename to lib/libkdchart/src/KDChartHeaderFooter_p.h diff --git a/libkdchart/src/KDChartLayoutItems.cpp b/lib/libkdchart/src/KDChartLayoutItems.cpp similarity index 100% rename from libkdchart/src/KDChartLayoutItems.cpp rename to lib/libkdchart/src/KDChartLayoutItems.cpp diff --git a/libkdchart/src/KDChartLayoutItems.h b/lib/libkdchart/src/KDChartLayoutItems.h similarity index 100% rename from libkdchart/src/KDChartLayoutItems.h rename to lib/libkdchart/src/KDChartLayoutItems.h diff --git a/libkdchart/src/KDChartLegend.cpp b/lib/libkdchart/src/KDChartLegend.cpp similarity index 100% rename from libkdchart/src/KDChartLegend.cpp rename to lib/libkdchart/src/KDChartLegend.cpp diff --git a/libkdchart/src/KDChartLegend.h b/lib/libkdchart/src/KDChartLegend.h similarity index 100% rename from libkdchart/src/KDChartLegend.h rename to lib/libkdchart/src/KDChartLegend.h diff --git a/libkdchart/src/KDChartLegend_p.h b/lib/libkdchart/src/KDChartLegend_p.h similarity index 100% rename from libkdchart/src/KDChartLegend_p.h rename to lib/libkdchart/src/KDChartLegend_p.h diff --git a/libkdchart/src/KDChartLineAttributes.cpp b/lib/libkdchart/src/KDChartLineAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartLineAttributes.cpp rename to lib/libkdchart/src/KDChartLineAttributes.cpp diff --git a/libkdchart/src/KDChartLineAttributes.h b/lib/libkdchart/src/KDChartLineAttributes.h similarity index 100% rename from libkdchart/src/KDChartLineAttributes.h rename to lib/libkdchart/src/KDChartLineAttributes.h diff --git a/libkdchart/src/KDChartLineDiagram.cpp b/lib/libkdchart/src/KDChartLineDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartLineDiagram.cpp rename to lib/libkdchart/src/KDChartLineDiagram.cpp diff --git a/libkdchart/src/KDChartLineDiagram.h b/lib/libkdchart/src/KDChartLineDiagram.h similarity index 100% rename from libkdchart/src/KDChartLineDiagram.h rename to lib/libkdchart/src/KDChartLineDiagram.h diff --git a/libkdchart/src/KDChartLineDiagram_p.cpp b/lib/libkdchart/src/KDChartLineDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartLineDiagram_p.cpp rename to lib/libkdchart/src/KDChartLineDiagram_p.cpp diff --git a/libkdchart/src/KDChartLineDiagram_p.h b/lib/libkdchart/src/KDChartLineDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartLineDiagram_p.h rename to lib/libkdchart/src/KDChartLineDiagram_p.h diff --git a/libkdchart/src/KDChartMarkerAttributes.cpp b/lib/libkdchart/src/KDChartMarkerAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartMarkerAttributes.cpp rename to lib/libkdchart/src/KDChartMarkerAttributes.cpp diff --git a/libkdchart/src/KDChartMarkerAttributes.h b/lib/libkdchart/src/KDChartMarkerAttributes.h similarity index 100% rename from libkdchart/src/KDChartMarkerAttributes.h rename to lib/libkdchart/src/KDChartMarkerAttributes.h diff --git a/libkdchart/src/KDChartMeasure.cpp b/lib/libkdchart/src/KDChartMeasure.cpp similarity index 100% rename from libkdchart/src/KDChartMeasure.cpp rename to lib/libkdchart/src/KDChartMeasure.cpp diff --git a/libkdchart/src/KDChartMeasure.h b/lib/libkdchart/src/KDChartMeasure.h similarity index 100% rename from libkdchart/src/KDChartMeasure.h rename to lib/libkdchart/src/KDChartMeasure.h diff --git a/libkdchart/src/KDChartModelDataCache_p.cpp b/lib/libkdchart/src/KDChartModelDataCache_p.cpp similarity index 100% rename from libkdchart/src/KDChartModelDataCache_p.cpp rename to lib/libkdchart/src/KDChartModelDataCache_p.cpp diff --git a/libkdchart/src/KDChartModelDataCache_p.h b/lib/libkdchart/src/KDChartModelDataCache_p.h similarity index 100% rename from libkdchart/src/KDChartModelDataCache_p.h rename to lib/libkdchart/src/KDChartModelDataCache_p.h diff --git a/libkdchart/src/KDChartNormalBarDiagram_p.cpp b/lib/libkdchart/src/KDChartNormalBarDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartNormalBarDiagram_p.cpp rename to lib/libkdchart/src/KDChartNormalBarDiagram_p.cpp diff --git a/libkdchart/src/KDChartNormalBarDiagram_p.h b/lib/libkdchart/src/KDChartNormalBarDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartNormalBarDiagram_p.h rename to lib/libkdchart/src/KDChartNormalBarDiagram_p.h diff --git a/libkdchart/src/KDChartNormalLineDiagram_p.cpp b/lib/libkdchart/src/KDChartNormalLineDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartNormalLineDiagram_p.cpp rename to lib/libkdchart/src/KDChartNormalLineDiagram_p.cpp diff --git a/libkdchart/src/KDChartNormalLineDiagram_p.h b/lib/libkdchart/src/KDChartNormalLineDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartNormalLineDiagram_p.h rename to lib/libkdchart/src/KDChartNormalLineDiagram_p.h diff --git a/libkdchart/src/KDChartNormalLyingBarDiagram_p.cpp b/lib/libkdchart/src/KDChartNormalLyingBarDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartNormalLyingBarDiagram_p.cpp rename to lib/libkdchart/src/KDChartNormalLyingBarDiagram_p.cpp diff --git a/libkdchart/src/KDChartNormalLyingBarDiagram_p.h b/lib/libkdchart/src/KDChartNormalLyingBarDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartNormalLyingBarDiagram_p.h rename to lib/libkdchart/src/KDChartNormalLyingBarDiagram_p.h diff --git a/libkdchart/src/KDChartNormalPlotter_p.cpp b/lib/libkdchart/src/KDChartNormalPlotter_p.cpp similarity index 100% rename from libkdchart/src/KDChartNormalPlotter_p.cpp rename to lib/libkdchart/src/KDChartNormalPlotter_p.cpp diff --git a/libkdchart/src/KDChartNormalPlotter_p.h b/lib/libkdchart/src/KDChartNormalPlotter_p.h similarity index 100% rename from libkdchart/src/KDChartNormalPlotter_p.h rename to lib/libkdchart/src/KDChartNormalPlotter_p.h diff --git a/libkdchart/src/KDChartNullPaintDevice.h b/lib/libkdchart/src/KDChartNullPaintDevice.h similarity index 100% rename from libkdchart/src/KDChartNullPaintDevice.h rename to lib/libkdchart/src/KDChartNullPaintDevice.h diff --git a/libkdchart/src/KDChartPaintContext.cpp b/lib/libkdchart/src/KDChartPaintContext.cpp similarity index 100% rename from libkdchart/src/KDChartPaintContext.cpp rename to lib/libkdchart/src/KDChartPaintContext.cpp diff --git a/libkdchart/src/KDChartPaintContext.h b/lib/libkdchart/src/KDChartPaintContext.h similarity index 100% rename from libkdchart/src/KDChartPaintContext.h rename to lib/libkdchart/src/KDChartPaintContext.h diff --git a/libkdchart/src/KDChartPainterSaver_p.h b/lib/libkdchart/src/KDChartPainterSaver_p.h similarity index 100% rename from libkdchart/src/KDChartPainterSaver_p.h rename to lib/libkdchart/src/KDChartPainterSaver_p.h diff --git a/libkdchart/src/KDChartPalette.cpp b/lib/libkdchart/src/KDChartPalette.cpp similarity index 100% rename from libkdchart/src/KDChartPalette.cpp rename to lib/libkdchart/src/KDChartPalette.cpp diff --git a/libkdchart/src/KDChartPalette.h b/lib/libkdchart/src/KDChartPalette.h similarity index 100% rename from libkdchart/src/KDChartPalette.h rename to lib/libkdchart/src/KDChartPalette.h diff --git a/libkdchart/src/KDChartPercentBarDiagram_p.cpp b/lib/libkdchart/src/KDChartPercentBarDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartPercentBarDiagram_p.cpp rename to lib/libkdchart/src/KDChartPercentBarDiagram_p.cpp diff --git a/libkdchart/src/KDChartPercentBarDiagram_p.h b/lib/libkdchart/src/KDChartPercentBarDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartPercentBarDiagram_p.h rename to lib/libkdchart/src/KDChartPercentBarDiagram_p.h diff --git a/libkdchart/src/KDChartPercentLineDiagram_p.cpp b/lib/libkdchart/src/KDChartPercentLineDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartPercentLineDiagram_p.cpp rename to lib/libkdchart/src/KDChartPercentLineDiagram_p.cpp diff --git a/libkdchart/src/KDChartPercentLineDiagram_p.h b/lib/libkdchart/src/KDChartPercentLineDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartPercentLineDiagram_p.h rename to lib/libkdchart/src/KDChartPercentLineDiagram_p.h diff --git a/libkdchart/src/KDChartPercentLyingBarDiagram_p.cpp b/lib/libkdchart/src/KDChartPercentLyingBarDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartPercentLyingBarDiagram_p.cpp rename to lib/libkdchart/src/KDChartPercentLyingBarDiagram_p.cpp diff --git a/libkdchart/src/KDChartPercentLyingBarDiagram_p.h b/lib/libkdchart/src/KDChartPercentLyingBarDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartPercentLyingBarDiagram_p.h rename to lib/libkdchart/src/KDChartPercentLyingBarDiagram_p.h diff --git a/libkdchart/src/KDChartPercentPlotter_p.cpp b/lib/libkdchart/src/KDChartPercentPlotter_p.cpp similarity index 100% rename from libkdchart/src/KDChartPercentPlotter_p.cpp rename to lib/libkdchart/src/KDChartPercentPlotter_p.cpp diff --git a/libkdchart/src/KDChartPercentPlotter_p.h b/lib/libkdchart/src/KDChartPercentPlotter_p.h similarity index 100% rename from libkdchart/src/KDChartPercentPlotter_p.h rename to lib/libkdchart/src/KDChartPercentPlotter_p.h diff --git a/libkdchart/src/KDChartPieAttributes.cpp b/lib/libkdchart/src/KDChartPieAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartPieAttributes.cpp rename to lib/libkdchart/src/KDChartPieAttributes.cpp diff --git a/libkdchart/src/KDChartPieAttributes.h b/lib/libkdchart/src/KDChartPieAttributes.h similarity index 100% rename from libkdchart/src/KDChartPieAttributes.h rename to lib/libkdchart/src/KDChartPieAttributes.h diff --git a/libkdchart/src/KDChartPieAttributes_p.h b/lib/libkdchart/src/KDChartPieAttributes_p.h similarity index 100% rename from libkdchart/src/KDChartPieAttributes_p.h rename to lib/libkdchart/src/KDChartPieAttributes_p.h diff --git a/libkdchart/src/KDChartPieDiagram.cpp b/lib/libkdchart/src/KDChartPieDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartPieDiagram.cpp rename to lib/libkdchart/src/KDChartPieDiagram.cpp diff --git a/libkdchart/src/KDChartPieDiagram.h b/lib/libkdchart/src/KDChartPieDiagram.h similarity index 100% rename from libkdchart/src/KDChartPieDiagram.h rename to lib/libkdchart/src/KDChartPieDiagram.h diff --git a/libkdchart/src/KDChartPieDiagram_p.h b/lib/libkdchart/src/KDChartPieDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartPieDiagram_p.h rename to lib/libkdchart/src/KDChartPieDiagram_p.h diff --git a/libkdchart/src/KDChartPlotter.cpp b/lib/libkdchart/src/KDChartPlotter.cpp similarity index 100% rename from libkdchart/src/KDChartPlotter.cpp rename to lib/libkdchart/src/KDChartPlotter.cpp diff --git a/libkdchart/src/KDChartPlotter.h b/lib/libkdchart/src/KDChartPlotter.h similarity index 100% rename from libkdchart/src/KDChartPlotter.h rename to lib/libkdchart/src/KDChartPlotter.h diff --git a/libkdchart/src/KDChartPlotter_p.cpp b/lib/libkdchart/src/KDChartPlotter_p.cpp similarity index 100% rename from libkdchart/src/KDChartPlotter_p.cpp rename to lib/libkdchart/src/KDChartPlotter_p.cpp diff --git a/libkdchart/src/KDChartPlotter_p.h b/lib/libkdchart/src/KDChartPlotter_p.h similarity index 100% rename from libkdchart/src/KDChartPlotter_p.h rename to lib/libkdchart/src/KDChartPlotter_p.h diff --git a/libkdchart/src/KDChartPolarCoordinatePlane.cpp b/lib/libkdchart/src/KDChartPolarCoordinatePlane.cpp similarity index 100% rename from libkdchart/src/KDChartPolarCoordinatePlane.cpp rename to lib/libkdchart/src/KDChartPolarCoordinatePlane.cpp diff --git a/libkdchart/src/KDChartPolarCoordinatePlane.h b/lib/libkdchart/src/KDChartPolarCoordinatePlane.h similarity index 100% rename from libkdchart/src/KDChartPolarCoordinatePlane.h rename to lib/libkdchart/src/KDChartPolarCoordinatePlane.h diff --git a/libkdchart/src/KDChartPolarCoordinatePlane_p.h b/lib/libkdchart/src/KDChartPolarCoordinatePlane_p.h similarity index 100% rename from libkdchart/src/KDChartPolarCoordinatePlane_p.h rename to lib/libkdchart/src/KDChartPolarCoordinatePlane_p.h diff --git a/libkdchart/src/KDChartPolarDiagram.cpp b/lib/libkdchart/src/KDChartPolarDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartPolarDiagram.cpp rename to lib/libkdchart/src/KDChartPolarDiagram.cpp diff --git a/libkdchart/src/KDChartPolarDiagram.h b/lib/libkdchart/src/KDChartPolarDiagram.h similarity index 100% rename from libkdchart/src/KDChartPolarDiagram.h rename to lib/libkdchart/src/KDChartPolarDiagram.h diff --git a/libkdchart/src/KDChartPolarDiagram_p.h b/lib/libkdchart/src/KDChartPolarDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartPolarDiagram_p.h rename to lib/libkdchart/src/KDChartPolarDiagram_p.h diff --git a/libkdchart/src/KDChartPolarGrid.cpp b/lib/libkdchart/src/KDChartPolarGrid.cpp similarity index 100% rename from libkdchart/src/KDChartPolarGrid.cpp rename to lib/libkdchart/src/KDChartPolarGrid.cpp diff --git a/libkdchart/src/KDChartPolarGrid.h b/lib/libkdchart/src/KDChartPolarGrid.h similarity index 100% rename from libkdchart/src/KDChartPolarGrid.h rename to lib/libkdchart/src/KDChartPolarGrid.h diff --git a/libkdchart/src/KDChartPosition.cpp b/lib/libkdchart/src/KDChartPosition.cpp similarity index 100% rename from libkdchart/src/KDChartPosition.cpp rename to lib/libkdchart/src/KDChartPosition.cpp diff --git a/libkdchart/src/KDChartPosition.h b/lib/libkdchart/src/KDChartPosition.h similarity index 100% rename from libkdchart/src/KDChartPosition.h rename to lib/libkdchart/src/KDChartPosition.h diff --git a/libkdchart/src/KDChartPrintingParameters.cpp b/lib/libkdchart/src/KDChartPrintingParameters.cpp similarity index 100% rename from libkdchart/src/KDChartPrintingParameters.cpp rename to lib/libkdchart/src/KDChartPrintingParameters.cpp diff --git a/libkdchart/src/KDChartPrintingParameters.h b/lib/libkdchart/src/KDChartPrintingParameters.h similarity index 100% rename from libkdchart/src/KDChartPrintingParameters.h rename to lib/libkdchart/src/KDChartPrintingParameters.h diff --git a/libkdchart/src/KDChartRelativePosition.cpp b/lib/libkdchart/src/KDChartRelativePosition.cpp similarity index 100% rename from libkdchart/src/KDChartRelativePosition.cpp rename to lib/libkdchart/src/KDChartRelativePosition.cpp diff --git a/libkdchart/src/KDChartRelativePosition.h b/lib/libkdchart/src/KDChartRelativePosition.h similarity index 100% rename from libkdchart/src/KDChartRelativePosition.h rename to lib/libkdchart/src/KDChartRelativePosition.h diff --git a/libkdchart/src/KDChartRingDiagram.cpp b/lib/libkdchart/src/KDChartRingDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartRingDiagram.cpp rename to lib/libkdchart/src/KDChartRingDiagram.cpp diff --git a/libkdchart/src/KDChartRingDiagram.h b/lib/libkdchart/src/KDChartRingDiagram.h similarity index 100% rename from libkdchart/src/KDChartRingDiagram.h rename to lib/libkdchart/src/KDChartRingDiagram.h diff --git a/libkdchart/src/KDChartRingDiagram_p.h b/lib/libkdchart/src/KDChartRingDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartRingDiagram_p.h rename to lib/libkdchart/src/KDChartRingDiagram_p.h diff --git a/libkdchart/src/KDChartRulerAttributes.cpp b/lib/libkdchart/src/KDChartRulerAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartRulerAttributes.cpp rename to lib/libkdchart/src/KDChartRulerAttributes.cpp diff --git a/libkdchart/src/KDChartRulerAttributes.h b/lib/libkdchart/src/KDChartRulerAttributes.h similarity index 100% rename from libkdchart/src/KDChartRulerAttributes.h rename to lib/libkdchart/src/KDChartRulerAttributes.h diff --git a/libkdchart/src/KDChartSignalCompressor.cpp b/lib/libkdchart/src/KDChartSignalCompressor.cpp similarity index 100% rename from libkdchart/src/KDChartSignalCompressor.cpp rename to lib/libkdchart/src/KDChartSignalCompressor.cpp diff --git a/libkdchart/src/KDChartSignalCompressor.h b/lib/libkdchart/src/KDChartSignalCompressor.h similarity index 100% rename from libkdchart/src/KDChartSignalCompressor.h rename to lib/libkdchart/src/KDChartSignalCompressor.h diff --git a/libkdchart/src/KDChartStackedBarDiagram_p.cpp b/lib/libkdchart/src/KDChartStackedBarDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartStackedBarDiagram_p.cpp rename to lib/libkdchart/src/KDChartStackedBarDiagram_p.cpp diff --git a/libkdchart/src/KDChartStackedBarDiagram_p.h b/lib/libkdchart/src/KDChartStackedBarDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartStackedBarDiagram_p.h rename to lib/libkdchart/src/KDChartStackedBarDiagram_p.h diff --git a/libkdchart/src/KDChartStackedLineDiagram_p.cpp b/lib/libkdchart/src/KDChartStackedLineDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartStackedLineDiagram_p.cpp rename to lib/libkdchart/src/KDChartStackedLineDiagram_p.cpp diff --git a/libkdchart/src/KDChartStackedLineDiagram_p.h b/lib/libkdchart/src/KDChartStackedLineDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartStackedLineDiagram_p.h rename to lib/libkdchart/src/KDChartStackedLineDiagram_p.h diff --git a/libkdchart/src/KDChartStackedLyingBarDiagram_p.cpp b/lib/libkdchart/src/KDChartStackedLyingBarDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartStackedLyingBarDiagram_p.cpp rename to lib/libkdchart/src/KDChartStackedLyingBarDiagram_p.cpp diff --git a/libkdchart/src/KDChartStackedLyingBarDiagram_p.h b/lib/libkdchart/src/KDChartStackedLyingBarDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartStackedLyingBarDiagram_p.h rename to lib/libkdchart/src/KDChartStackedLyingBarDiagram_p.h diff --git a/libkdchart/src/KDChartStockBarAttributes.cpp b/lib/libkdchart/src/KDChartStockBarAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartStockBarAttributes.cpp rename to lib/libkdchart/src/KDChartStockBarAttributes.cpp diff --git a/libkdchart/src/KDChartStockBarAttributes.h b/lib/libkdchart/src/KDChartStockBarAttributes.h similarity index 100% rename from libkdchart/src/KDChartStockBarAttributes.h rename to lib/libkdchart/src/KDChartStockBarAttributes.h diff --git a/libkdchart/src/KDChartStockDiagram.cpp b/lib/libkdchart/src/KDChartStockDiagram.cpp similarity index 100% rename from libkdchart/src/KDChartStockDiagram.cpp rename to lib/libkdchart/src/KDChartStockDiagram.cpp diff --git a/libkdchart/src/KDChartStockDiagram.h b/lib/libkdchart/src/KDChartStockDiagram.h similarity index 100% rename from libkdchart/src/KDChartStockDiagram.h rename to lib/libkdchart/src/KDChartStockDiagram.h diff --git a/libkdchart/src/KDChartStockDiagram_p.cpp b/lib/libkdchart/src/KDChartStockDiagram_p.cpp similarity index 100% rename from libkdchart/src/KDChartStockDiagram_p.cpp rename to lib/libkdchart/src/KDChartStockDiagram_p.cpp diff --git a/libkdchart/src/KDChartStockDiagram_p.h b/lib/libkdchart/src/KDChartStockDiagram_p.h similarity index 100% rename from libkdchart/src/KDChartStockDiagram_p.h rename to lib/libkdchart/src/KDChartStockDiagram_p.h diff --git a/libkdchart/src/KDChartTextArea.cpp b/lib/libkdchart/src/KDChartTextArea.cpp similarity index 100% rename from libkdchart/src/KDChartTextArea.cpp rename to lib/libkdchart/src/KDChartTextArea.cpp diff --git a/libkdchart/src/KDChartTextArea.h b/lib/libkdchart/src/KDChartTextArea.h similarity index 100% rename from libkdchart/src/KDChartTextArea.h rename to lib/libkdchart/src/KDChartTextArea.h diff --git a/libkdchart/src/KDChartTextArea_p.h b/lib/libkdchart/src/KDChartTextArea_p.h similarity index 100% rename from libkdchart/src/KDChartTextArea_p.h rename to lib/libkdchart/src/KDChartTextArea_p.h diff --git a/libkdchart/src/KDChartTextAttributes.cpp b/lib/libkdchart/src/KDChartTextAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartTextAttributes.cpp rename to lib/libkdchart/src/KDChartTextAttributes.cpp diff --git a/libkdchart/src/KDChartTextAttributes.h b/lib/libkdchart/src/KDChartTextAttributes.h similarity index 100% rename from libkdchart/src/KDChartTextAttributes.h rename to lib/libkdchart/src/KDChartTextAttributes.h diff --git a/libkdchart/src/KDChartThreeDBarAttributes.cpp b/lib/libkdchart/src/KDChartThreeDBarAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartThreeDBarAttributes.cpp rename to lib/libkdchart/src/KDChartThreeDBarAttributes.cpp diff --git a/libkdchart/src/KDChartThreeDBarAttributes.h b/lib/libkdchart/src/KDChartThreeDBarAttributes.h similarity index 100% rename from libkdchart/src/KDChartThreeDBarAttributes.h rename to lib/libkdchart/src/KDChartThreeDBarAttributes.h diff --git a/libkdchart/src/KDChartThreeDBarAttributes_p.h b/lib/libkdchart/src/KDChartThreeDBarAttributes_p.h similarity index 100% rename from libkdchart/src/KDChartThreeDBarAttributes_p.h rename to lib/libkdchart/src/KDChartThreeDBarAttributes_p.h diff --git a/libkdchart/src/KDChartThreeDLineAttributes.cpp b/lib/libkdchart/src/KDChartThreeDLineAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartThreeDLineAttributes.cpp rename to lib/libkdchart/src/KDChartThreeDLineAttributes.cpp diff --git a/libkdchart/src/KDChartThreeDLineAttributes.h b/lib/libkdchart/src/KDChartThreeDLineAttributes.h similarity index 100% rename from libkdchart/src/KDChartThreeDLineAttributes.h rename to lib/libkdchart/src/KDChartThreeDLineAttributes.h diff --git a/libkdchart/src/KDChartThreeDLineAttributes_p.h b/lib/libkdchart/src/KDChartThreeDLineAttributes_p.h similarity index 100% rename from libkdchart/src/KDChartThreeDLineAttributes_p.h rename to lib/libkdchart/src/KDChartThreeDLineAttributes_p.h diff --git a/libkdchart/src/KDChartThreeDPieAttributes.cpp b/lib/libkdchart/src/KDChartThreeDPieAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartThreeDPieAttributes.cpp rename to lib/libkdchart/src/KDChartThreeDPieAttributes.cpp diff --git a/libkdchart/src/KDChartThreeDPieAttributes.h b/lib/libkdchart/src/KDChartThreeDPieAttributes.h similarity index 100% rename from libkdchart/src/KDChartThreeDPieAttributes.h rename to lib/libkdchart/src/KDChartThreeDPieAttributes.h diff --git a/libkdchart/src/KDChartThreeDPieAttributes_p.h b/lib/libkdchart/src/KDChartThreeDPieAttributes_p.h similarity index 100% rename from libkdchart/src/KDChartThreeDPieAttributes_p.h rename to lib/libkdchart/src/KDChartThreeDPieAttributes_p.h diff --git a/libkdchart/src/KDChartValueTrackerAttributes.cpp b/lib/libkdchart/src/KDChartValueTrackerAttributes.cpp similarity index 100% rename from libkdchart/src/KDChartValueTrackerAttributes.cpp rename to lib/libkdchart/src/KDChartValueTrackerAttributes.cpp diff --git a/libkdchart/src/KDChartValueTrackerAttributes.h b/lib/libkdchart/src/KDChartValueTrackerAttributes.h similarity index 100% rename from libkdchart/src/KDChartValueTrackerAttributes.h rename to lib/libkdchart/src/KDChartValueTrackerAttributes.h diff --git a/libkdchart/src/KDChartWidget.cpp b/lib/libkdchart/src/KDChartWidget.cpp similarity index 100% rename from libkdchart/src/KDChartWidget.cpp rename to lib/libkdchart/src/KDChartWidget.cpp diff --git a/libkdchart/src/KDChartWidget.h b/lib/libkdchart/src/KDChartWidget.h similarity index 100% rename from libkdchart/src/KDChartWidget.h rename to lib/libkdchart/src/KDChartWidget.h diff --git a/libkdchart/src/KDChartWidget_p.h b/lib/libkdchart/src/KDChartWidget_p.h similarity index 100% rename from libkdchart/src/KDChartWidget_p.h rename to lib/libkdchart/src/KDChartWidget_p.h diff --git a/libkdchart/src/KDChartZoomParameters.h b/lib/libkdchart/src/KDChartZoomParameters.h similarity index 100% rename from libkdchart/src/KDChartZoomParameters.h rename to lib/libkdchart/src/KDChartZoomParameters.h diff --git a/libkdchart/src/KDTextDocument.cpp b/lib/libkdchart/src/KDTextDocument.cpp similarity index 100% rename from libkdchart/src/KDTextDocument.cpp rename to lib/libkdchart/src/KDTextDocument.cpp diff --git a/libkdchart/src/KDTextDocument.h b/lib/libkdchart/src/KDTextDocument.h similarity index 100% rename from libkdchart/src/KDTextDocument.h rename to lib/libkdchart/src/KDTextDocument.h diff --git a/libkdchart/src/Makefile b/lib/libkdchart/src/Makefile similarity index 100% rename from libkdchart/src/Makefile rename to lib/libkdchart/src/Makefile diff --git a/libkdchart/src/PrerenderedElements/KDChartTextLabelCache.cpp b/lib/libkdchart/src/PrerenderedElements/KDChartTextLabelCache.cpp similarity index 100% rename from libkdchart/src/PrerenderedElements/KDChartTextLabelCache.cpp rename to lib/libkdchart/src/PrerenderedElements/KDChartTextLabelCache.cpp diff --git a/libkdchart/src/PrerenderedElements/KDChartTextLabelCache.h b/lib/libkdchart/src/PrerenderedElements/KDChartTextLabelCache.h similarity index 100% rename from libkdchart/src/PrerenderedElements/KDChartTextLabelCache.h rename to lib/libkdchart/src/PrerenderedElements/KDChartTextLabelCache.h diff --git a/libkdchart/src/Scenery/ChartGraphicsItem.cpp b/lib/libkdchart/src/Scenery/ChartGraphicsItem.cpp similarity index 100% rename from libkdchart/src/Scenery/ChartGraphicsItem.cpp rename to lib/libkdchart/src/Scenery/ChartGraphicsItem.cpp diff --git a/libkdchart/src/Scenery/ChartGraphicsItem.h b/lib/libkdchart/src/Scenery/ChartGraphicsItem.h similarity index 100% rename from libkdchart/src/Scenery/ChartGraphicsItem.h rename to lib/libkdchart/src/Scenery/ChartGraphicsItem.h diff --git a/libkdchart/src/Scenery/ReverseMapper.cpp b/lib/libkdchart/src/Scenery/ReverseMapper.cpp similarity index 100% rename from libkdchart/src/Scenery/ReverseMapper.cpp rename to lib/libkdchart/src/Scenery/ReverseMapper.cpp diff --git a/libkdchart/src/Scenery/ReverseMapper.h b/lib/libkdchart/src/Scenery/ReverseMapper.h similarity index 100% rename from libkdchart/src/Scenery/ReverseMapper.h rename to lib/libkdchart/src/Scenery/ReverseMapper.h diff --git a/libkdchart/src/Ternary/KDChartAbstractTernaryDiagram.cpp b/lib/libkdchart/src/Ternary/KDChartAbstractTernaryDiagram.cpp similarity index 100% rename from libkdchart/src/Ternary/KDChartAbstractTernaryDiagram.cpp rename to lib/libkdchart/src/Ternary/KDChartAbstractTernaryDiagram.cpp diff --git a/libkdchart/src/Ternary/KDChartAbstractTernaryDiagram.h b/lib/libkdchart/src/Ternary/KDChartAbstractTernaryDiagram.h similarity index 100% rename from libkdchart/src/Ternary/KDChartAbstractTernaryDiagram.h rename to lib/libkdchart/src/Ternary/KDChartAbstractTernaryDiagram.h diff --git a/libkdchart/src/Ternary/KDChartAbstractTernaryDiagram_p.h b/lib/libkdchart/src/Ternary/KDChartAbstractTernaryDiagram_p.h similarity index 100% rename from libkdchart/src/Ternary/KDChartAbstractTernaryDiagram_p.h rename to lib/libkdchart/src/Ternary/KDChartAbstractTernaryDiagram_p.h diff --git a/libkdchart/src/Ternary/KDChartTernaryAxis.cpp b/lib/libkdchart/src/Ternary/KDChartTernaryAxis.cpp similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryAxis.cpp rename to lib/libkdchart/src/Ternary/KDChartTernaryAxis.cpp diff --git a/libkdchart/src/Ternary/KDChartTernaryAxis.h b/lib/libkdchart/src/Ternary/KDChartTernaryAxis.h similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryAxis.h rename to lib/libkdchart/src/Ternary/KDChartTernaryAxis.h diff --git a/libkdchart/src/Ternary/KDChartTernaryCoordinatePlane.cpp b/lib/libkdchart/src/Ternary/KDChartTernaryCoordinatePlane.cpp similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryCoordinatePlane.cpp rename to lib/libkdchart/src/Ternary/KDChartTernaryCoordinatePlane.cpp diff --git a/libkdchart/src/Ternary/KDChartTernaryCoordinatePlane.h b/lib/libkdchart/src/Ternary/KDChartTernaryCoordinatePlane.h similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryCoordinatePlane.h rename to lib/libkdchart/src/Ternary/KDChartTernaryCoordinatePlane.h diff --git a/libkdchart/src/Ternary/KDChartTernaryCoordinatePlane_p.h b/lib/libkdchart/src/Ternary/KDChartTernaryCoordinatePlane_p.h similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryCoordinatePlane_p.h rename to lib/libkdchart/src/Ternary/KDChartTernaryCoordinatePlane_p.h diff --git a/libkdchart/src/Ternary/KDChartTernaryGrid.cpp b/lib/libkdchart/src/Ternary/KDChartTernaryGrid.cpp similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryGrid.cpp rename to lib/libkdchart/src/Ternary/KDChartTernaryGrid.cpp diff --git a/libkdchart/src/Ternary/KDChartTernaryGrid.h b/lib/libkdchart/src/Ternary/KDChartTernaryGrid.h similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryGrid.h rename to lib/libkdchart/src/Ternary/KDChartTernaryGrid.h diff --git a/libkdchart/src/Ternary/KDChartTernaryLineDiagram.cpp b/lib/libkdchart/src/Ternary/KDChartTernaryLineDiagram.cpp similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryLineDiagram.cpp rename to lib/libkdchart/src/Ternary/KDChartTernaryLineDiagram.cpp diff --git a/libkdchart/src/Ternary/KDChartTernaryLineDiagram.h b/lib/libkdchart/src/Ternary/KDChartTernaryLineDiagram.h similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryLineDiagram.h rename to lib/libkdchart/src/Ternary/KDChartTernaryLineDiagram.h diff --git a/libkdchart/src/Ternary/KDChartTernaryLineDiagram_p.h b/lib/libkdchart/src/Ternary/KDChartTernaryLineDiagram_p.h similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryLineDiagram_p.h rename to lib/libkdchart/src/Ternary/KDChartTernaryLineDiagram_p.h diff --git a/libkdchart/src/Ternary/KDChartTernaryPointDiagram.cpp b/lib/libkdchart/src/Ternary/KDChartTernaryPointDiagram.cpp similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryPointDiagram.cpp rename to lib/libkdchart/src/Ternary/KDChartTernaryPointDiagram.cpp diff --git a/libkdchart/src/Ternary/KDChartTernaryPointDiagram.h b/lib/libkdchart/src/Ternary/KDChartTernaryPointDiagram.h similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryPointDiagram.h rename to lib/libkdchart/src/Ternary/KDChartTernaryPointDiagram.h diff --git a/libkdchart/src/Ternary/KDChartTernaryPointDiagram_p.h b/lib/libkdchart/src/Ternary/KDChartTernaryPointDiagram_p.h similarity index 100% rename from libkdchart/src/Ternary/KDChartTernaryPointDiagram_p.h rename to lib/libkdchart/src/Ternary/KDChartTernaryPointDiagram_p.h diff --git a/libkdchart/src/Ternary/TernaryConstants.cpp b/lib/libkdchart/src/Ternary/TernaryConstants.cpp similarity index 100% rename from libkdchart/src/Ternary/TernaryConstants.cpp rename to lib/libkdchart/src/Ternary/TernaryConstants.cpp diff --git a/libkdchart/src/Ternary/TernaryConstants.h b/lib/libkdchart/src/Ternary/TernaryConstants.h similarity index 100% rename from libkdchart/src/Ternary/TernaryConstants.h rename to lib/libkdchart/src/Ternary/TernaryConstants.h diff --git a/libkdchart/src/Ternary/TernaryPoint.cpp b/lib/libkdchart/src/Ternary/TernaryPoint.cpp similarity index 100% rename from libkdchart/src/Ternary/TernaryPoint.cpp rename to lib/libkdchart/src/Ternary/TernaryPoint.cpp diff --git a/libkdchart/src/Ternary/TernaryPoint.h b/lib/libkdchart/src/Ternary/TernaryPoint.h similarity index 100% rename from libkdchart/src/Ternary/TernaryPoint.h rename to lib/libkdchart/src/Ternary/TernaryPoint.h diff --git a/libkdchart/src/kdchart_export.h b/lib/libkdchart/src/kdchart_export.h similarity index 100% rename from libkdchart/src/kdchart_export.h rename to lib/libkdchart/src/kdchart_export.h diff --git a/libkdchart/src/ui_KDChartDatasetSelector.h b/lib/libkdchart/src/ui_KDChartDatasetSelector.h similarity index 100% rename from libkdchart/src/ui_KDChartDatasetSelector.h rename to lib/libkdchart/src/ui_KDChartDatasetSelector.h diff --git a/src/view/ExportPanel.cpp b/src/view/ExportPanel.cpp new file mode 100644 index 0000000..72dd016 --- /dev/null +++ b/src/view/ExportPanel.cpp @@ -0,0 +1,145 @@ +/* + Copyright 2010-2012 Grégory Soutadé + + This file is part of KissCount. + + KissCount 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 3 of the License, or + (at your option) any later version. + + KissCount 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 KissCount. If not, see . +*/ + +#include "ExportPanel.hpp" + +ExportPanel::ExportPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, parent), _operations(0) +{ + DEFAULT_FONT(font); + std::vector::iterator accountIt; + std::vector::iterator categoryIt; + + QVBoxLayout *vbox = new QVBoxLayout; + QVBoxLayout *vbox2 = new QVBoxLayout; + QHBoxLayout *hbox = new QHBoxLayout; + + setLayout(vbox); + + _searchButton = new QPushButton(_("Search")); + + connect(_searchButton, SIGNAL(clicked()), this, SLOT(OnButtonSearch())); + + _banner = new SearchBanner(kiss, this, this, OnEnter); + + vbox->addWidget(_banner); + vbox->addWidget(_searchButton); + + _grid = new GridAccount(_kiss, this, false, false, true); + + hbox->addWidget(_grid); + + _exportButton = new QPushButton(_("Export")); + + connect(_exportButton, SIGNAL(clicked()), this, SLOT(OnButtonExport())); + + vbox2->addWidget(_exportButton); + + hbox->addLayout(vbox2); + + vbox->addLayout(hbox); +} + +ExportPanel::~ExportPanel() +{ +} + +KissPanel* ExportPanel::CreatePanel() +{ + return new ExportPanel(_kiss, _wxUI); +} + +QPushButton* ExportPanel::GetButton() +{ + if (!_KissButton) + { + _KissButton = new QPushButton(QIcon(EXPORT_ICON), "", this); + _KissButton->setFixedSize(128, 128); + _KissButton->setIconSize(QSize(128, 128)); + } + + return _KissButton; +} + +QString ExportPanel::GetToolTip() +{ + return _("Export"); +} + +void ExportPanel::OnEnter(void* caller) +{ + ExportPanel* _this = (ExportPanel*) caller; + + _this->OnButtonExport(); +} + +void ExportPanel::OnButtonSearch() +{ + _operations = _banner->Search(); + + if (!_operations) return; + + if (_operations->size() > 1) + QMessageBox::information(0, _("KissCount"), QString::number(_operations->size()) + _(" entries found")); + else if (_operations->size() == 1) + QMessageBox::information(0, _("KissCount"), _("1 entry found")); + else + { + QMessageBox::information(0, _("KissCount"), _("No entry found")); + return; + } + + _grid->LoadOperations(_operations, 0, 0); + + layout(); +} + +void ExportPanel::OnButtonExport() +{ + QString path; + + if (!_operations || !_operations->size()) + { + QMessageBox::critical(0, _("Error"), _("No operation to save")); + return; + } + + path = QFileDialog::getSaveFileName(0, _("Save as"), "", _kiss->GetExportEngineExtensions()); + + if (path.size() == 0) + return; + + _exportEngine = _kiss->GetExportEngine(path); + + if (!_exportEngine) + { + QMessageBox::critical(0, _("Error"), _("Any engine can process this file !")); + return ; + } + + if (_exportEngine->SaveFile(_operations)) + QMessageBox::information(0, _("KissCount"), _("Operations successfuly saved")); + else + QMessageBox::critical(0, _("Error"), _("Failed to save operations")); + +} + +void ExportPanel::OnShow() +{ + _wxUI->setWindowTitle(_("KissCount - Export")); +} diff --git a/src/view/ExportPanel.hpp b/src/view/ExportPanel.hpp new file mode 100644 index 0000000..f27ed5c --- /dev/null +++ b/src/view/ExportPanel.hpp @@ -0,0 +1,63 @@ +/* + Copyright 2010-2012 Grégory Soutadé + + This file is part of KissCount. + + KissCount 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 3 of the License, or + (at your option) any later version. + + KissCount 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 KissCount. If not, see . +*/ + +#ifndef EXPORTPANEL_H +#define EXPORTPANEL_H + +#include + +#include "view.hpp" +#include "grid/GridAccount.hpp" +#include "AccountPanel.hpp" +#include "SearchBanner.hpp" +#include +#include + +class GridAccount; +class SearchBanner; +class ExportEngine; + +class ExportPanel: public KissPanel +{ + Q_OBJECT; + +public: + ExportPanel(KissCount* kiss, wxUI *parent); + ~ExportPanel(); + + KissPanel* CreatePanel(); + QPushButton* GetButton(); + QString GetToolTip(); + void OnShow(); + +private slots: + void OnButtonSearch(); + void OnButtonExport(); + +private: + std::vector *_operations; + SearchBanner* _banner; + GridAccount *_grid; + QPushButton* _searchButton, *_exportButton; + ExportEngine* _exportEngine; + + static void OnEnter(void* caller); +}; + +#endif