Git commit 72cef54b581b5658d106a5b261acdc5cbe94a43d by Stefan Gerlach. Committed on 14/07/2016 at 22:50. Pushed by sgerlach into branch 'frameworks'.
Merge branch 'master' into frameworks M +2 -1 doc/index.docbook M +2 -5 src/backend/worksheet/plots/cartesian/XYCurve.cpp M +13 -13 src/kdefrontend/dockwidgets/AxisDock.cpp M +5 -5 src/kdefrontend/dockwidgets/CartesianPlotDock.cpp M +22 -22 src/kdefrontend/dockwidgets/CartesianPlotLegendDock.cpp M +5 -5 src/kdefrontend/dockwidgets/CustomPointDock.cpp M +5 -5 src/kdefrontend/dockwidgets/NoteDock.cpp M +54 -54 src/kdefrontend/dockwidgets/WorksheetDock.cpp M +102 -102 src/kdefrontend/dockwidgets/XYCurveDock.cpp M +2 -2 src/kdefrontend/dockwidgets/XYFitCurveDock.cpp M +1 -0 src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp M +7 -7 src/kdefrontend/dockwidgets/XYFourierTransformCurveDock.cpp M +20 -20 src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp M +9 -9 src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp http://commits.kde.org/labplot/72cef54b581b5658d106a5b261acdc5cbe94a43d diff --cc src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp index c7745b9,a074153..bad0989 --- a/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp @@@ -92,12 -92,12 +92,12 @@@ void XYInterpolationCurveDock::setupGen QStandardItem* item = model->item(nsl_interp_type_steffen); item->setFlags(item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled)); #endif - for(int i=0; i < NSL_INTERP_PCH_VARIANT_COUNT; i++) + for (int i=0; i < NSL_INTERP_PCH_VARIANT_COUNT; i++) uiGeneralTab.cbVariant->addItem(i18n(nsl_interp_pch_variant_name[i])); - for(int i=0; i < NSL_INTERP_EVALUATE_COUNT; i++) + for (int i=0; i < NSL_INTERP_EVALUATE_COUNT; i++) uiGeneralTab.cbEval->addItem(i18n(nsl_interp_evaluate_name[i])); - uiGeneralTab.pbRecalculate->setIcon(KIcon("run-build")); + uiGeneralTab.pbRecalculate->setIcon(QIcon::fromTheme("run-build")); QHBoxLayout* layout = new QHBoxLayout(ui.tabGeneral); layout->setMargin(0); diff --cc src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp index 3724592,b88f17d..1fe696e --- a/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp @@@ -87,16 -87,16 +87,16 @@@ void XYSmoothCurveDock::setupGeneral() cbYDataColumn = new TreeViewComboBox(generalTab); gridLayout->addWidget(cbYDataColumn, 5, 3, 1, 2); - for(int i=0; i < NSL_SMOOTH_TYPE_COUNT; i++) + for (int i=0; i < NSL_SMOOTH_TYPE_COUNT; i++) uiGeneralTab.cbType->addItem(i18n(nsl_smooth_type_name[i])); - for(int i=0; i < NSL_SMOOTH_WEIGHT_TYPE_COUNT; i++) + for (int i=0; i < NSL_SMOOTH_WEIGHT_TYPE_COUNT; i++) uiGeneralTab.cbWeight->addItem(i18n(nsl_smooth_weight_type_name[i])); - for(int i=0; i < NSL_SMOOTH_PAD_MODE_COUNT; i++) + for (int i=0; i < NSL_SMOOTH_PAD_MODE_COUNT; i++) uiGeneralTab.cbMode->addItem(i18n(nsl_smooth_pad_mode_name[i])); - uiGeneralTab.pbRecalculate->setIcon(KIcon("run-build")); + uiGeneralTab.pbRecalculate->setIcon(QIcon::fromTheme("run-build")); QHBoxLayout* layout = new QHBoxLayout(ui.tabGeneral); layout->setMargin(0); _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
