Commit ff8af5f8 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Port libs from klocale to klocalizedstring and kf5::ki18n

parent 4597e720
......@@ -22,7 +22,7 @@
#include "KoCreatePathTool.h"
#include <KoIcon.h>
#include <klocale.h>
#include <klocalizedstring.h>
KoCreatePathToolFactory::KoCreatePathToolFactory()
: KoToolFactoryBase(KoCreatePathTool_ID)
......
......@@ -21,7 +21,7 @@
#include "KoPencilTool.h"
#include <KoIcon.h>
#include <klocale.h>
#include <klocalizedstring.h>
KoPencilToolFactory::KoPencilToolFactory()
: KoToolFactoryBase("KoPencilTool")
......
......@@ -31,7 +31,7 @@
#include <KoColor.h>
#include <knuminput.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <QPainter>
#include <QLabel>
......
......@@ -37,7 +37,7 @@
#include <KoStrokeConfigWidget.h>
#include <knuminput.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <kcombobox.h>
#include <QStackedWidget>
......
......@@ -20,7 +20,7 @@
#include "KoConnectionShapeConfigWidget.h"
#include "commands/KoConnectionShapeTypeCommand.h"
#include <KoIcon.h>
#include <klocale.h>
#include <klocalizedstring.h>
KoConnectionShapeConfigWidget::KoConnectionShapeConfigWidget()
{
......
......@@ -27,7 +27,7 @@
#include <KoXmlNS.h>
#include <KoIcon.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <KoShapeStroke.h>
#include <KoShapeLoadingContext.h>
......
......@@ -28,7 +28,7 @@
#include <KoIcon.h>
#include <ktoggleaction.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <QPainter>
#include <QRectF>
#include <kdebug.h>
......
......@@ -26,7 +26,7 @@
#include "KoShapeLoadingContext.h"
#include <KoIcon.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <KoXmlReader.h>
#include <KoXmlNS.h>
......
......@@ -41,7 +41,7 @@
#include <QObject>
#include <kpagedialog.h>
#include <klocale.h>
#include <klocalizedstring.h>
class KoShapeController::Private
{
......
......@@ -22,7 +22,7 @@
#include "KoShapePaste.h"
#include <kdebug.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <KoOdfLoadingContext.h>
#include <KoOdfReadStore.h>
......
......@@ -33,7 +33,7 @@
#include "KoShapeBasedDocumentBase.h"
#include "KoToolSelection.h"
#include <klocale.h>
#include <klocalizedstring.h>
#include <kactioncollection.h>
#include <QWidget>
#include <QFile>
......
......@@ -56,7 +56,7 @@
#include <kdebug.h>
#include <kglobal.h>
#include <QAction>
#include <klocale.h>
#include <klocalizedstring.h>
#include <kshortcut.h>
#include <QStack>
#include <QLabel>
......
......@@ -39,7 +39,7 @@
#include <KoProperties.h>
#include <kdebug.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <QUrl>
#include <kio/netaccess.h>
#include <kmessagebox.h>
......
......@@ -18,7 +18,7 @@
*/
#include "KoConnectionShapeTypeCommand.h"
#include <klocale.h>
#include <klocalizedstring.h>
KoConnectionShapeTypeCommand::KoConnectionShapeTypeCommand(
KoConnectionShape * connection, KoConnectionShape::Type type, KUndo2Command *parent)
......
......@@ -18,7 +18,7 @@
*/
#include "KoEventActionAddCommand.h"
#include <klocale.h>
#include <klocalizedstring.h>
#include "KoShape.h"
#include "KoEventAction.h"
......
......@@ -18,7 +18,7 @@
*/
#include "KoEventActionRemoveCommand.h"
#include <klocale.h>
#include <klocalizedstring.h>
#include "KoShape.h"
#include "KoEventAction.h"
......
......@@ -21,7 +21,7 @@
#include "KoParameterHandleMoveCommand.h"
#include "KoParameterShape.h"
#include <klocale.h>
#include <klocalizedstring.h>
KoParameterHandleMoveCommand::KoParameterHandleMoveCommand(KoParameterShape *shape, int handleId, const QPointF &startPoint, const QPointF &endPoint, Qt::KeyboardModifiers keyModifiers, KUndo2Command *parent)
: KUndo2Command(parent)
......
......@@ -21,7 +21,7 @@
#include "KoParameterToPathCommand.h"
#include "KoPathPoint.h"
#include "KoParameterShape.h"
#include <klocale.h>
#include <klocalizedstring.h>
class KoParameterToPathCommandPrivate
{
......
......@@ -21,7 +21,7 @@
#include "KoPathBreakAtPointCommand.h"
#include "KoPathPoint.h"
#include <klocale.h>
#include <klocalizedstring.h>
/*
* The algorithm to break a multiple open or closed subpaths is:
......
......@@ -21,7 +21,7 @@
#include "KoPathCombineCommand.h"
#include "KoShapeBasedDocumentBase.h"
#include "KoShapeContainer.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoPathCombineCommand::Private
{
......
......@@ -19,7 +19,7 @@
*/
#include "KoPathControlPointMoveCommand.h"
#include <klocale.h>
#include <klocalizedstring.h>
#include <math.h>
KoPathControlPointMoveCommand::KoPathControlPointMoveCommand(
......
......@@ -20,7 +20,7 @@
#include "KoPathFillRuleCommand.h"
#include "KoPathShape.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoPathFillRuleCommand::Private
{
......
......@@ -22,7 +22,7 @@
#include "KoPathPoint.h"
#include <KoPathSegment.h>
#include <klocale.h>
#include <klocalizedstring.h>
class KoPathPointInsertCommandPrivate
{
......
......@@ -22,7 +22,7 @@
#include "KoPathPoint.h"
#include "KoPathPointData.h"
#include "KoPathShape.h"
#include <klocale.h>
#include <klocalizedstring.h>
#include <QPointF>
class Q_DECL_HIDDEN KoPathPointMergeCommand::Private
......
......@@ -21,7 +21,7 @@
#include "KoPathPointMoveCommand.h"
#include "KoPathPoint.h"
#include <klocale.h>
#include <klocalizedstring.h>
class KoPathPointMoveCommandPrivate
{
......
......@@ -22,7 +22,7 @@
#include "KoSubpathRemoveCommand.h"
#include "KoShapeController.h"
#include "KoPathPoint.h"
#include <klocale.h>
#include <klocalizedstring.h>
class KoPathPointRemoveCommandPrivate
{
......
......@@ -21,7 +21,7 @@
#include "KoPathPointTypeCommand.h"
#include <KoPathSegment.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <math.h>
KoPathPointTypeCommand::KoPathPointTypeCommand(
......
......@@ -19,7 +19,7 @@
#include "KoPathReverseCommand.h"
#include "KoPathShape.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoPathReverseCommand::Private
{
......
......@@ -20,7 +20,7 @@
#include "KoPathSegmentBreakCommand.h"
#include "KoPathPoint.h"
#include <klocale.h>
#include <klocalizedstring.h>
#include <math.h>
KoPathSegmentBreakCommand::KoPathSegmentBreakCommand(const KoPathPointData & pointData, KUndo2Command *parent)
......
......@@ -21,7 +21,7 @@
#include "KoPathSegmentTypeCommand.h"
#include <KoPathSegment.h>
#include <klocale.h>
#include <klocalizedstring.h>
KoPathSegmentTypeCommand::KoPathSegmentTypeCommand(const KoPathPointData & pointData, SegmentType segmentType, KUndo2Command *parent)
: KUndo2Command(parent)
......
......@@ -22,7 +22,7 @@
#include "KoMarker.h"
#include "KoPathShape.h"
#include <klocale.h>
#include <klocalizedstring.h>
KoPathShapeMarkerCommand::KoPathShapeMarkerCommand(const QList<KoPathShape*> &shapes, KoMarker *marker, KoMarkerData::MarkerPosition position, KUndo2Command *parent)
: KUndo2Command(parent)
......
......@@ -23,7 +23,7 @@
#include "KoShapeGroup.h"
#include "commands/KoShapeMoveCommand.h"
#include <klocale.h>
#include <klocalizedstring.h>
// #include <kdebug.h>
class Q_DECL_HIDDEN KoShapeAlignCommand::Private
......
......@@ -22,7 +22,7 @@
#include "KoShape.h"
#include "KoShapeBackground.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeBackgroundCommand::Private
{
......
......@@ -24,7 +24,7 @@
#include "KoPathShape.h"
#include "KoShapeBasedDocumentBase.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeClipCommand::Private
{
......
......@@ -23,7 +23,7 @@
#include "KoShapeContainer.h"
#include "KoShapeBasedDocumentBase.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeCreateCommand::Private
{
......
......@@ -22,7 +22,7 @@
#include "KoShapeContainer.h"
#include "KoShapeBasedDocumentBase.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeDeleteCommand::Private
{
......
......@@ -24,7 +24,7 @@
#include "KoShape.h"
#include <QMap>
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeDistributeCommand::Private
{
......
......@@ -24,7 +24,7 @@
#include "KoShapeGroup.h"
#include "KoShapeContainer.h"
#include <klocale.h>
#include <klocalizedstring.h>
// static
KoShapeGroupCommand * KoShapeGroupCommand::createCommand(KoShapeGroup *container, const QList<KoShape *> &shapes, KUndo2Command *parent)
......
......@@ -19,7 +19,7 @@
#include "KoShapeKeepAspectRatioCommand.h"
#include <klocale.h>
#include <klocalizedstring.h>
#include <KoShape.h>
......
......@@ -21,7 +21,7 @@
#include "KoShapeLockCommand.h"
#include "KoShape.h"
#include <klocale.h>
#include <klocalizedstring.h>
KoShapeLockCommand::KoShapeLockCommand(const QList<KoShape*> &shapes, const QList<bool> &oldLock, const QList<bool> &newLock, KUndo2Command *parent)
: KUndo2Command(parent)
......
......@@ -21,7 +21,7 @@
#include "KoShapeMoveCommand.h"
#include <KoShape.h>
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeMoveCommand::Private
{
......
......@@ -20,7 +20,7 @@
#include "KoShapeRenameCommand.h"
#include <QString>
#include <klocale.h>
#include <klocalizedstring.h>
#include "KoShape.h"
class Q_DECL_HIDDEN KoShapeRenameCommand::Private
......
......@@ -23,7 +23,7 @@
#include "KoShapeManager.h"
#include "KoShapeContainer.h"
#include <klocale.h>
#include <klocalizedstring.h>
#include <kdebug.h>
#include <limits.h>
......
......@@ -20,7 +20,7 @@
#include "KoShapeRunAroundCommand.h"
#include <QString>
#include <klocale.h>
#include <klocalizedstring.h>
#include "KoShape.h"
class Q_DECL_HIDDEN KoShapeRunAroundCommand::Private
......
......@@ -21,7 +21,7 @@
#include "KoShape.h"
#include "KoShapeShadow.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeShadowCommand::Private
{
......
......@@ -21,7 +21,7 @@
#include "KoShapeShearCommand.h"
#include "KoShape.h"
#include <klocale.h>
#include <klocalizedstring.h>
class KoShapeShearCommandPrivate
{
......
......@@ -21,7 +21,7 @@
#include "KoShapeSizeCommand.h"
#include <KoShape.h>
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeSizeCommand::Private
{
......
......@@ -24,7 +24,7 @@
#include "KoShape.h"
#include "KoShapeStrokeModel.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeStrokeCommand::Private
{
......
......@@ -20,7 +20,7 @@
#include "KoShapeTransparencyCommand.h"
#include "KoShape.h"
#include <klocale.h>
#include <klocalizedstring.h>
class Q_DECL_HIDDEN KoShapeTransparencyCommand::Private
{
......
......@@ -31,7 +31,7 @@
#include <KoOdfLoadingContext.h>
#include <KoOdfReadStore.h>
#include <klocale.h>
#include <klocalizedstring.h>
class KoShapeUnclipCommand::Private : public KoOdfPaste
{
......
......@@ -22,7 +22,7 @@
#include "KoShapeGroupCommand_p.h"
#include "KoShapeContainer.h"
#include <klocale.h>
#include <klocalizedstring.h>
KoShapeUngroupCommand::KoShapeUngroupCommand(KoShapeContainer *container, const QList<KoShape *> &shapes,
const QList<KoShape*> &topLevelShapes, KUndo2Command *parent)
......
......@@ -19,7 +19,7 @@
*/
#include "KoSubpathJoinCommand.h"
#include <klocale.h>
#include <klocalizedstring.h>
KoSubpathJoinCommand::KoSubpathJoinCommand(const KoPathPointData &pointData1, const KoPathPointData &pointData2, KUndo2Command *parent)
: KUndo2Command(parent)
......
......@@ -22,7 +22,7 @@
#include "KoPathPointData.h"
#include "KoPathPoint.h"
#include <klocale.h>
#include <klocalizedstring.h>
KoSubpathRemoveCommand::KoSubpathRemoveCommand(KoPathShape *pathShape, int subpathIndex, KUndo2Command *parent)
: KUndo2Command(parent)
......
......@@ -27,7 +27,7 @@
#include <KoXmlNS.h>
#include <KoStore.h>
#include <KoStoreDevice.h>
#include <klocale.h>
#include <klocalizedstring.h>
#define SVGSHAPEFACTORYID "SvgShapeFactory"
......
......@@ -21,7 +21,7 @@
#include "KoCreateShapesToolFactory.h"
#include "KoCreateShapesTool.h"
#include <klocale.h>
#include <klocalizedstring.h>
KoCreateShapesToolFactory::KoCreateShapesToolFactory()
: KoToolFactoryBase(KoCreateShapesTool_ID)
......
......@@ -22,7 +22,7 @@
#include "KoPanTool.h"
#include <KoIcon.h>
#include <klocale.h>
#include <klocalizedstring.h>
KoPanToolFactory::KoPanToolFactory()
: KoToolFactoryBase(KoPanTool_ID)
......
......@@ -25,7 +25,7 @@
#include "commands/KoPathControlPointMoveCommand.h"
#include "commands/KoPathSegmentTypeCommand.h"
#include <KoCanvasBase.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <limits>
#include <math.h>
......
......@@ -54,7 +54,7 @@
#include <QAction>
#include <kdebug.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <QPainter>
#include <QBitmap>
#include <QTabWidget>
......
......@@ -22,7 +22,7 @@
#include "KoPathShape.h"