Commit bab06f3a authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix some EBN issues

parent 6a737a98
......@@ -54,11 +54,9 @@
#include "KisApplicationArguments.h"
#include <opengl/kis_opengl.h>
#include "input/KisQtWidgetsTweaker.h"
#include <kis_debug.h>
#if defined Q_OS_WIN
#include <windows.h>
#include <stdlib.h>
#include <kis_tablet_support_win.h>
#include <kis_tablet_support_win8.h>
#include <QLibrary>
......
......@@ -83,7 +83,7 @@ template <template <class> class Container, class T>
}
/**
* Coverts a list of objects with type T into a list of objects of type R.
* Converts a list of objects with type T into a list of objects of type R.
* The conversion is done implicitly, therefore the c-tor of type R should
* support it. The main usage case is conversion of pointers in "descendant-
* to-parent" way.
......
......@@ -103,7 +103,7 @@ public:
bool writeToAlpha = false);
/**
* @brief converToNormalMap
* Conver a channel of the device to a normal map. The channel will be interpretted as a heightmap.
* Convert a channel of the device to a normal map. The channel will be interpretted as a heightmap.
* @param device the device
* @param rect the rectangle to apply this to.
* @param xRadius the xradius
......
......@@ -208,7 +208,7 @@ class bk_max_flow {
} else if(get(m_res_cap_map, from_source)){
// there is no sink connect, so we can't augment this path, but to
// avoid adding m_source to the active nodes, we just activate this
// node and set the approciate things
// node and set the appropriate things
set_tree(current_node, tColorTraits::black());
set_edge_to_parent(current_node, from_source);
put(m_dist_map, current_node, 1);
......
......@@ -30,7 +30,7 @@
/**
* @brief The FillLayer class
* A fill layer is much like a filter layer in that it takes a name
* and filter. It however specialises in filters that fill the whole canvas,
* and filter. It however specializes in filters that fill the whole canvas,
* such as a pattern or full color fill.
*/
class KRITALIBKIS_EXPORT FillLayer : public Node
......
......@@ -73,4 +73,4 @@ Row {
initialPage: categories[0].page;
}
}
\ No newline at end of file
}
......@@ -127,4 +127,4 @@ Item {
source: "../images/shadow-lc.png";
fillMode: Image.Stretch;
}
}
\ No newline at end of file
}
......@@ -43,4 +43,4 @@ Page {
}
}
}
}
\ No newline at end of file
}
......@@ -61,4 +61,4 @@ DnD.DropArea {
item.roundTop = (Constants.IsLandscape && y > 0);
}
}
}
\ No newline at end of file
}
......@@ -66,7 +66,7 @@ public:
/**
* @brief toXML
* Covert the gradient to an XML string.
* Convert the gradient to an XML string.
*/
void toXML(QDomDocument& doc, QDomElement& gradientElt) const;
/**
......
......@@ -36,7 +36,6 @@
#include <resources/KoPattern.h>
#include <QGridLayout>
#include <QLabel>
#include <QSpinBox>
#include <QLineEdit>
#include "kis_int_parse_spin_box.h"
......
......@@ -26,7 +26,6 @@
#include <QVBoxLayout>
#include <QList>
#include <QPolygon>
#include <QRect>
#include <QtMath>
#include <KSharedConfig>
......
......@@ -26,7 +26,6 @@
#include <QVBoxLayout>
#include <QList>
#include <QPolygon>
#include <QRect>
#include <QtMath>
#include <KSharedConfig>
......
......@@ -26,7 +26,6 @@
#include <QVBoxLayout>
#include <QList>
#include <QPolygon>
#include <QRect>
#include <QtMath>
#include <KSharedConfig>
......
......@@ -26,7 +26,6 @@
#include <QVBoxLayout>
#include <QList>
#include <QPolygon>
#include <QRect>
#include <QtMath>
#include <KSharedConfig>
......
......@@ -32,7 +32,6 @@
#include <resources/KoPattern.h>
#include <resources/KoAbstractGradient.h>
#include <resources/KoColorSet.h>
#include <resources/KoAbstractGradient.h>
#include <resources/KoSvgSymbolCollectionResource.h>
......
......@@ -345,7 +345,7 @@ void KisAssistantTool::beginPrimaryAction(KoPointerEvent *event)
assistantSelected(assistant); // whatever handle is the closest contains the selected assistant
}
}
if (newAssistantAllowed==true){//don't make a new assistant when I'm just toogling visiblity//
if (newAssistantAllowed==true){//don't make a new assistant when I'm just toogling visibility//
QString key = m_options.availableAssistantsComboBox->model()->index( m_options.availableAssistantsComboBox->currentIndex(), 0 ).data(Qt::UserRole).toString();
m_newAssistant = toQShared(KisPaintingAssistantFactoryRegistry::instance()->get(key)->createPaintingAssistant());
m_internalMode = MODE_CREATION;
......
......@@ -201,7 +201,7 @@ TimelineFramesView::TimelineFramesView(QWidget *parent)
m_d->audioOptionsButton = new QToolButton(this);
m_d->audioOptionsButton->setAutoRaise(true);
m_d->audioOptionsButton->setIcon(KisIconUtils::loadIcon("audio-none"));
m_d->audioOptionsButton->setIconSize(QSize(20, 20)); // very small on windows if not explicity set
m_d->audioOptionsButton->setIconSize(QSize(20, 20)); // very small on windows if not explicitly set
m_d->audioOptionsButton->setPopupMode(QToolButton::InstantPopup);
m_d->audioOptionsMenu = new QMenu(this);
......@@ -260,7 +260,7 @@ TimelineFramesView::TimelineFramesView(QWidget *parent)
m_d->zoomDragButton = new KisZoomButton(this);
m_d->zoomDragButton->setAutoRaise(true);
m_d->zoomDragButton->setIcon(KisIconUtils::loadIcon("zoom-horizontal"));
m_d->zoomDragButton->setIconSize(QSize(20, 20)); // this icon is very small on windows if no explicity set
m_d->zoomDragButton->setIconSize(QSize(20, 20)); // this icon is very small on windows if no explicitly set
m_d->zoomDragButton->setToolTip(i18nc("@info:tooltip", "Zoom Timeline. Hold down and drag left or right."));
m_d->zoomDragButton->setPopupMode(QToolButton::InstantPopup);
......
......@@ -30,7 +30,6 @@
#include <kis_node_manager.h>
#include <kis_image.h>
#include <kis_group_layer.h>
#include <kis_layer.h>
#include <kis_paint_device.h>
#include "kis_signal_compressor.h"
#include <KisView.h>
......
......@@ -74,7 +74,6 @@
#include "kis_node_model.h"
#include "canvas/kis_canvas2.h"
#include "KisDocument.h"
#include "kis_dummies_facade_base.h"
#include "kis_shape_controller.h"
#include "kis_selection_mask.h"
......@@ -92,7 +91,6 @@
#include "ui_wdglayerbox.h"
#include <QProxyStyle>
#include <QPainter>
class KisLayerBoxStyle : public QProxyStyle
{
......
......@@ -40,7 +40,6 @@
#include <kis_workspace_resource.h>
#include <kis_canvas_resource_provider.h>
#include <KisMainWindow.h>
#include <kis_canvas_resource_provider.h>
#include <KisViewManager.h>
#include <kis_display_color_converter.h>
#include <kis_canvas2.h>
......
......@@ -22,7 +22,6 @@
#include <QQmlContext>
#include <QAction>
#include <QUrl>
#include <QAction>
#include <QKeyEvent>
#include <QApplication>
......@@ -45,7 +44,6 @@
#include <KisMimeDatabase.h>
#include <kis_action_manager.h>
#include <kis_action.h>
#include <kis_config.h>
#include <Theme.h>
#include <Settings.h>
......
......@@ -41,10 +41,8 @@
#include <kis_config_widget.h>
#include <KisDocument.h>
#include <QHBoxLayout>
#include <KisImportExportFilter.h>
#include <kis_config.h>
#include <kis_file_name_requester.h>
#include <KisDocument.h>
#include <KoDialog.h>
#include "kis_slider_spin_box.h"
#include "kis_acyclic_signal_connector.h"
......
......@@ -76,7 +76,7 @@ void DlgColorSpaceConversion::setInitialColorSpace(const KoColorSpace *cs)
return;
}
if (cs->profile()->getEstimatedTRC()[0]==1.0) {
//this tries to automatically determine whether optimisations ought to be checked or not.
//this tries to automatically determine whether optimizations ought to be checked or not.
//if the space you're converting from is linear TRC, uncheck.
m_page->chkAllowLCMSOptimization->setCheckState(Qt::Unchecked);
} else {
......
......@@ -27,8 +27,6 @@
#include <kis_size_group.h>
#include <klocalizedstring.h>
#include <kis_config.h>
#include <kis_document_aware_spin_box_unit_manager.h>
#include <QComboBox>
......
......@@ -39,7 +39,6 @@
#include <KisViewManager.h>
#include <kis_image.h>
#include <kis_action.h>
#include <KisDocument.h>
#include <kis_paint_layer.h>
#include <kis_painter.h>
#include <kis_paint_device.h>
......
......@@ -22,7 +22,7 @@ class TestFilter(unittest.TestCase):
def testEmptyNameProperty(self):
self.assertFalse(self._instance.name())
# segmentation fault here, I neet to verify that.
# segmentation fault here, I need to verify that.
def testConfigurationProperties(self):
pass
# infoObject = InfoObject()
......
......@@ -33,7 +33,6 @@
#include <kis_paint_device.h>
#include <kundo2command.h>
#include <KoColorSpaceRegistry.h>
#include <KisImportExportManager.h>
#include <kis_file_name_requester.h>
#include "ui_wdgfastcolortransfer.h"
......
......@@ -45,7 +45,7 @@ public:
* This filter will allow the user to input an image and have it be approximated with
* a halftone pattern. https://en.wikipedia.org/wiki/Halftone
*
* The primary usecase of such a filter is for specialised printing techniques, but for
* The primary usecase of such a filter is for specialized printing techniques, but for
* many people the half-tone pattern also serves as a neutral pattern that is more pleasant
* than plain flat look. The half tone in this case also becomes a stylistic technique.
*
......
......@@ -29,7 +29,6 @@
#include <KoXmlReader.h>
#include <KoPathShapeLoader.h>
#include <KoShapeBackground.h>
#include <KoPathShapeLoader.h>
#include <KoEmbeddedDocumentSaver.h>
#include <SvgSavingContext.h>
#include <SvgLoadingContext.h>
......
......@@ -52,7 +52,6 @@
#include <QAction>
#include <QDebug>
#include <QAction>
#include <QGridLayout>
#include <QToolButton>
#include <QCheckBox>
......
......@@ -33,8 +33,6 @@
#include <KoShapeContainer_p.h>
#include <KoTextDocumentLayout.h>
#include <KoXmlNS.h>
#include <KoOdfLoadingContext.h>
#include <KoShapeLoadingContext.h>
#include <KoDocumentResourceManager.h>
......
......@@ -44,7 +44,6 @@
#include <KoText.h>
#include <KoTextDocument.h>
#include <KoTextDocumentLayout.h>
#include <KoTextEditor.h>
#include <KoTextPage.h>
#include <KoTextShapeContainerModel.h>
#include <KoPageProvider.h>
......
......@@ -37,7 +37,6 @@
#include "dialogs/TableDialog.h"
#include "dialogs/SectionFormatDialog.h"
#include "dialogs/SectionsSplitDialog.h"
#include "dialogs/SimpleTableWidget.h"
#include "commands/AutoResizeCommand.h"
#include "commands/ChangeListLevelCommand.h"
#include "FontSizeAction.h"
......
......@@ -33,7 +33,6 @@
#include <QTabWidget>
#include <QInputDialog>
#include <QMessageBox>
#include <QInputDialog>
#include <QDebug>
......
......@@ -38,7 +38,7 @@
* to make some end cursors stop moving, so we have:
* KoTextLoader -> calling -> KoSection::setKeepEndBound()
* KoTextLoader -> calling -> KoSectionModel::allowMovingEndBound()
* ^-- this needed to restore defaul behaviour after load
* ^-- this needed to restore default behaviour after load
*
* 2) Level. Level means the depth of the section in tree. Root
* sections has 0 (zero) level. Now if you look at the possible
......
......@@ -22,7 +22,6 @@
#include "KoTextRangeManager.h"
#include "KoTextInlineRdf.h"
#include "TextDebug.h"
#include "TextDebug.h"
#include <QTextCursor>
......
......@@ -42,7 +42,6 @@
#include <klocalizedstring.h>
#include "TextDebug.h"
#include "TextDebug.h"
//A convenience function to get a ListIdType from a format
......
......@@ -22,8 +22,6 @@
#include <QTest>
#include <QCoreApplication>
#include <QTest>
#include "filestest.h"
#ifndef FILES_DATA_DIR
......
......@@ -65,8 +65,6 @@ extern "C" {
#include <kis_jpeg_destination.h>
#include "kis_iterator_ng.h"
#include <KoColorModelStandardIds.h>
#define ICC_MARKER (JPEG_APP0 + 2) /* JPEG marker code for ICC */
#define ICC_OVERHEAD_LEN 14 /* size of non-profile data in APP2 */
#define MAX_BYTES_IN_MARKER 65533 /* maximum data len of a JPEG marker */
......
......@@ -28,7 +28,6 @@ extern "C" {
#include <QColor>
#include <QVector>
#include <QColor>
#include "kis_types.h"
#include "kis_annotation.h"
......
......@@ -53,7 +53,6 @@
#include <metadata/kis_meta_data_filter_registry_model.h>
#include <metadata/kis_exif_info_visitor.h>
#include <generator/kis_generator_layer.h>
#include <KisImportExportManager.h>
#include <KisExportCheckRegistry.h>
#include "kis_jpeg_converter.h"
......
......@@ -26,7 +26,6 @@
#include <KoColorSpace.h>
#include <KoColor.h>
#include "KisDocument.h"
#include "kis_image.h"
#include "testutil.h"
#include "KisPart.h"
......
......@@ -30,7 +30,6 @@
#include "filter/kis_filter_registry.h"
#include "filter/kis_filter_configuration.h"
#include "filter/kis_filter.h"
#include "KisDocument.h"
#include "kis_image.h"
#include "kis_pixel_selection.h"
#include "kis_group_layer.h"
......@@ -52,7 +51,6 @@
#include "kis_transform_mask_params_interface.h"
#include <filter/kis_filter_registry.h>
#include <generator/kis_generator_registry.h>
#include <KoResourcePaths.h>
......@@ -135,8 +133,6 @@ void KisKraSaverTest::testSaveEmpty()
delete doc;
}
#include <filter/kis_filter_configuration.h>
#include "generator/kis_generator_registry.h"
#include <generator/kis_generator.h>
void testRoundTripFillLayerImpl(const QString &testName, KisFilterConfigurationSP config)
......@@ -425,8 +421,6 @@ void KisKraSaverTest::testRoundTripColorizeMask()
QCOMPARE(strokes[2].color.colorSpace(), weirdCS);
}
#include "kis_shape_layer.h"
#include <KoPathShape.h>
#include <KoColorBackground.h>
void KisKraSaverTest::testRoundTripShapeLayer()
......
......@@ -32,7 +32,6 @@
#include "filter/kis_filter_registry.h"
#include "filter/kis_filter_configuration.h"
#include "filter/kis_filter.h"
#include "KisDocument.h"
#include "kis_image.h"
#include "kis_pixel_selection.h"
#include "kis_group_layer.h"
......@@ -50,7 +49,6 @@
#include "../kis_kra_savexml_visitor.h"
#include <filter/kis_filter_registry.h>
#include <generator/kis_generator_registry.h>
void KisKraSaveXmlVisitorTest::initTestCase()
......
......@@ -18,7 +18,6 @@
#ifndef _UTIL_H_
#define _UTIL_H_
#include <QTest>
#include <QTest>
#include <QBitArray>
......@@ -34,7 +33,6 @@
#include "filter/kis_filter_registry.h"
#include "filter/kis_filter_configuration.h"
#include "filter/kis_filter.h"
#include "KisDocument.h"
#include "KisPart.h"
#include "kis_image.h"
#include "kis_pixel_selection.h"
......
......@@ -35,7 +35,6 @@
#include <KoDialog.h>
#include <kpluginfactory.h>
#include <kpassworddialog.h>
#include <QFileInfo>
// calligra's headers
#include <KoColorSpace.h>
......
......@@ -40,7 +40,6 @@
#include <kis_paint_layer.h>
#include <kis_group_layer.h>
#include <kis_config.h>
#include <kis_properties_configuration.h>
#include <metadata/kis_meta_data_store.h>
#include <metadata/kis_meta_data_filter_registry_model.h>
#include <metadata/kis_exif_info_visitor.h>
......
......@@ -26,7 +26,6 @@ class QIODevice;
#include <QBuffer>
#include <kis_annotation.h>
#include <kis_debug.h>
#include "psd.h"
#include "psd_utils.h"
......
......@@ -21,8 +21,6 @@
#include <QIODevice>
#include <QBuffer>
#include <kis_debug.h>
#include "psd_utils.h"
#include "psd_resource_block.h"
......
......@@ -35,8 +35,6 @@
#include <kis_paint_device.h>
#include <kis_transaction.h>
#include <kis_debug.h>
#include <kis_annotation.h>
#include <kis_types.h>
#include "psd.h"
#include "psd_header.h"
......
......@@ -21,7 +21,6 @@
#include <QTest>
#include <QCoreApplication>
#include <klocalizedstring.h>
#include <QTest>
#include <compression.h>
#include <QByteArray>
#include <QBuffer>
......
......@@ -21,7 +21,6 @@
#include <QTest>
#include <QCoreApplication>
#include <klocalizedstring.h>
#include <QTest>
#include <psd.h>
#include <psd_header.h>
#include <psd_colormode_block.h>
......
......@@ -21,7 +21,6 @@
#include <QTest>
#include <QCoreApplication>
#include <klocalizedstring.h>
#include <QTest>
#include <psd_header.h>
#ifndef FILES_DATA_DIR
#error "FILES_DATA_DIR not set. A directory with the data used for testing the importing of files in krita"
......
......@@ -21,7 +21,6 @@
#include <QTest>
#include <QCoreApplication>
#include <klocalizedstring.h>
#include <QTest>
#include <psd_utils.h>
#include <QByteArray>
#include <QBuffer>
......
......@@ -20,8 +20,6 @@
#include <QFileInfo>
#include <QDir>
#include <QFileInfo>
#include <kis_image.h>
#include <kis_group_layer.h>
......
......@@ -24,10 +24,7 @@
#include <QDomDocument>
#include <QFileInfo>
#include <QSlider>
#include <QFileInfo>
#include <QDir>
#include <QFileInfo>
#include <QApplication>
#include <kpluginfactory.h>
......
......@@ -34,7 +34,6 @@
#include <kis_adjustment_layer.h>
#include <kis_image.h>
#include <kis_paint_layer.h>
#include <kis_types.h>
#include <generator/kis_generator_layer.h>
#include "kis_tiff_converter.h"
#include <kis_iterator_ng.h>
......
......@@ -22,8 +22,6 @@
#include <QTest>
#include <QCoreApplication>
#include <QTest>
#include "filestest.h"
#include <KoColorModelStandardIds.h>
......
......@@ -148,7 +148,7 @@ closeout(FILE *f,const char *name)
*/
if( fputc('\0', f) != EOF &&
fflush(f) == 0 )
errno = EIO ; /* Argh, everything succeds. Just call it an I/O error */
errno = EIO ; /* Argh, everything succedes. Just call it an I/O error */
}
}
FatalUnexpected(_("!Error writing file %s"),name);
......
......@@ -35,7 +35,6 @@
#include <kis_compositeop_option.h>
#include <kis_pressure_spacing_option_widget.h>
#include "kis_texture_option.h"
#include "kis_curve_option_widget.h"
#include <kis_pressure_mirror_option_widget.h>
#include "kis_pressure_texture_strength_option.h"
#include "kis_pressure_hsv_option.h"
......
......@@ -36,8 +36,6 @@
#include <KoMixColorsOp.h>
#include <kis_cross_device_color_picker.h>
#include <KoColor.h>
class KisRandomConstAccessorNG;
......
......@@ -42,7 +42,6 @@
#include <kis_pressure_spacing_option_widget.h>
#include <kis_pressure_rate_option.h>
#include "kis_texture_option.h"
#include "kis_curve_option_widget.h"
#include <kis_pressure_mirror_option_widget.h>
#include "kis_pressure_texture_strength_option.h"
#include <KisMaskingBrushOption.h>
......
......@@ -174,7 +174,6 @@ QPainterPath KisDuplicateOpSettings::brushOutline(const KisPaintInformation &inf
#include <brushengine/kis_uniform_paintop_property.h>
#include "kis_paintop_preset.h"
#include "kis_paintop_settings_update_proxy.h"
#include "kis_duplicateop_option.h"
#include "kis_standard_uniform_properties_factory.h"
......
......@@ -33,7 +33,6 @@
#include <kis_curve_option_widget.h>
#include <kis_compositeop_option.h>
#include "kis_texture_option.h"
#include "kis_curve_option_widget.h"
#include <kis_pressure_mirror_option_widget.h>
#include "kis_pressure_texture_strength_option.h"
#include <brushengine/kis_paintop_lod_limitations.h>
......
......@@ -94,8 +94,6 @@ QPainterPath KisDeformPaintOpSettings::brushOutline(const KisPaintInformation &i
#include <brushengine/kis_combo_based_paintop_property.h>
#include "kis_paintop_preset.h"
#include "kis_paintop_settings_update_proxy.h"
#include "kis_brush_size_option.h"
#include "kis_deform_option.h"
#include "kis_standard_uniform_properties_factory.h"
......
......@@ -36,7 +36,6 @@
#include <kis_compositeop_option.h>
#include <kis_filter_option.h>
#include "kis_texture_option.h"
#include "kis_curve_option_widget.h"
#include <kis_pressure_mirror_option_widget.h>
#include "kis_pressure_texture_strength_option.h"
......
......@@ -36,7 +36,6 @@
#include <kis_paint_action_type_option.h>
#include <kis_compositeop_option.h>
#include "kis_texture_option.h"
#include "kis_curve_option_widget.h"
#include <kis_pressure_mirror_option_widget.h>
#include "kis_pressure_texture_strength_option.h"
......
......@@ -26,7 +26,6 @@
#include "kis_paintop_option.h"
#include "kis_global.h"
#include "kis_paintop_option.h"
#include <brushengine/kis_paint_information.h>
#include "kritapaintop_export.h"
#include "kis_dynamic_sensor.h"
......
......@@ -51,7 +51,6 @@ bool KisParticlePaintOpSettings::paintIncremental()
#include <brushengine/kis_slider_based_paintop_property.h>
#include "kis_paintop_preset.h"
#include "kis_paintop_settings_update_proxy.h"
#include "kis_particleop_option.h"
#include "kis_standard_uniform_properties_factory.h"
......
......@@ -26,7 +26,6 @@
#include <kis_compositeop_option.h>
#include <kis_pressure_spacing_option_widget.h>
//#include "kis_texture_option.h"
#include "kis_curve_option_widget.h"
//#include "kis_pressure_texture_strength_option.h"
#include "kis_roundmarkerop_settings.h"
#include "kis_roundmarker_option.h"
......