Merge remote-tracking branch 'origin/master' into kexi-master3-staniek

Conflicts:
	kexi/kexi.appdata.xml

(also fixed trailing spaces - break in git hook)

krita/crashreporter/main.cpp

@@ -23,7 +23,6 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <KoServiceLocator.h>
 #include <kapplication.h>
 #include <kdebug.h>
 

krita/image/tests/kis_layer_style_projection_plane_test.h

@@ -27,7 +27,7 @@
 class KisLayerStyleProjectionPlaneTest : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void testShadow();
     void testGlow();
     void testGlowGradient();

krita/image/tests/kis_layer_styles_test.h

@@ -24,7 +24,7 @@
 class KisLayerStylesTest : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void testLayerStylesFull();
     void testLayerStylesPartial();
     void testLayerStylesPartialVary();

krita/image/tests/kis_projection_leaf_test.h

@@ -24,7 +24,7 @@
 class KisProjectionLeafTest : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void test();
     void testPassThrough();
     void testNestedPassThrough();

krita/image/tests/kis_psd_layer_style_test.h

@@ -24,7 +24,7 @@
 class KisPSDLayerStyleTest : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void testRoundTrip();
 };
 

krita/krita.appdata.xml

@@ -24,6 +24,7 @@
   <summary xml:lang="sv">Digital målning, kreativ frihet</summary>
   <summary xml:lang="uk">Цифрове малювання, творча свобода</summary>
   <summary xml:lang="x-test">xxDigital Painting, Creative Freedomxx</summary>
+  <summary xml:lang="zh-CN">数码绘图，自由创作</summary>
   <description>
     <p>Krita is the full-featured digital art studio.</p>
     <p xml:lang="bs">Krita je potpuni digitalni umjetnički studio.</p>
@@ -46,6 +47,7 @@
     <p xml:lang="sv">Krita är den fullfjädrade digitala konststudion.</p>
     <p xml:lang="uk">Krita — повноцінний комплекс для створення цифрових художніх творів.</p>
     <p xml:lang="x-test">xxKrita is the full-featured digital art studio.xx</p>
+    <p xml:lang="zh-CN">Krita 是全功能的数码艺术工作室。</p>
     <p>It is perfect for sketching and painting, and presents an end–to–end solution for creating digital painting files from scratch by masters.</p>
     <p xml:lang="bs">On je savršen za skiciranje i slikanje i predstavlja finalno rješenje za kreiranje digitalnih slika od nule s majstorima</p>
     <p xml:lang="ca">És perfecte per fer esbossos i pintar, i presenta una solució final per crear fitxers de dibuix digital des de zero per a mestres.</p>

krita/libpsd/tests/kis_asl_parser_test.h

@@ -24,7 +24,7 @@
 class KisAslParserTest : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void test();
     void testWithCallbacks();
     void testASLXMLWriter();

krita/plugins/extensions/dockers/presethistory/presethistory_dock.cpp

@@ -142,4 +142,3 @@ void PresetHistoryDock::addPreset(KisPaintOpPresetSP preset)
 
 }
 
-#include "presethistory_dock.moc"

krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp

@@ -296,5 +296,4 @@ void KisBrightnessContrastConfigWidget::setConfiguration(const KisPropertiesConf
 }
 
 
-#include "kis_brightness_contrast_filter.moc"
 

krita/plugins/paintops/tangentnormal/kis_tangent_normal_paintop_settings_widget.cpp

@@ -84,4 +84,3 @@ KisPropertiesConfiguration* KisTangentNormalPaintOpSettingsWidget::configuration
 }
 
 
-#include "kis_tangent_normal_paintop_settings_widget.moc"

krita/ui/KisMainWindow.cpp

@@ -320,14 +320,13 @@ KisMainWindow::KisMainWindow()
     QDockWidget *toolbox = createDockWidget(&toolBoxFactory);
     toolbox->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
-
     if (cfg.toolOptionsInDocker()) {
         ToolDockerFactory toolDockerFactory;
         d->toolOptionsDocker = qobject_cast<KoToolDocker*>(createDockWidget(&toolDockerFactory));
     }
 
-
     QMap<QString, QAction*> dockwidgetActions;
+    dockwidgetActions[toolbox->toggleViewAction()->text()] = toolbox->toggleViewAction();
     foreach(const QString & docker, KoDockRegistry::instance()->keys()) {
         KoDockFactoryBase *factory = KoDockRegistry::instance()->value(docker);
         QDockWidget *dw = createDockWidget(factory);

krita/ui/KisMainWindow.h

@@ -445,7 +445,7 @@ protected:
 
     void moveEvent(QMoveEvent *e);
 
-private slots:
+private Q_SLOTS:
     void initializeGeometry();
     void showManual();
 

krita/ui/KisViewManager.cpp

@@ -50,7 +50,6 @@
 #include <kmenubar.h>
 #include <kmenu.h>
 #include <QMessageBox>
-#include <KoServiceLocator.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>

krita/ui/canvas/kis_grid_manager.cpp

@@ -101,4 +101,3 @@ void KisGridManager::toggleSnapToGrid()
     }
 }
 
-#include "kis_grid_manager.moc"

krita/ui/dialogs/kis_dlg_adjustment_layer.cc

@@ -141,4 +141,3 @@ void KisDlgAdjustmentLayer::slotFilterWidgetSizeChanged()
     QMetaObject::invokeMethod(this, "adjustSize", Qt::QueuedConnection);
 }
 
-#include "kis_dlg_adjustment_layer.moc"

krita/ui/dialogs/kis_dlg_filter.h

@@ -62,7 +62,7 @@ private:
     void setDialogTitle(KisFilterSP f);
     void updatePreview();
 
-private slots:
+private Q_SLOTS:
     void slotFilterWidgetSizeChanged();
 
 private:

krita/ui/dialogs/kis_dlg_layer_style.h

@@ -244,10 +244,10 @@ public:
     void addNewStyle(KisPSDLayerStyleSP style);
     void loadCollection(const QString &fileName);
 
-private slots:
+private Q_SLOTS:
     void loadStyles(const QString &name);
     void selectStyle(QListWidgetItem *previous, QListWidgetItem* current);
-signals:
+Q_SIGNALS:
     void styleSelected(KisPSDLayerStyleSP style);
 
 private:
@@ -266,10 +266,10 @@ public:
 
     KisPSDLayerStyleSP style() const;
 
-signals:
+Q_SIGNALS:
     void configChanged();
 
-public slots:
+public Q_SLOTS:
     void slotMasterFxSwitchChanged(bool value);
     void syncGlobalAngle(int angle);
 

krita/ui/tests/kis_asl_layer_style_serializer_test.h

@@ -24,7 +24,7 @@
 class KisAslLayerStyleSerializerTest : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void testReading();
     void testWriting();
     void testWritingGlobalPatterns();

krita/ui/widgets/kis_advanced_color_space_selector.cc

@@ -153,16 +153,16 @@ void KisAdvancedColorSpaceSelector::fillCmbDepths(const KoID& id)
     if (depths.contains(Integer8BitsColorDepthID)) {
         sortedDepths << Integer8BitsColorDepthID;
     }
-    else if (depths.contains(Integer16BitsColorDepthID)) {
+    if (depths.contains(Integer16BitsColorDepthID)) {
         sortedDepths << Integer16BitsColorDepthID;
     }
-    else if (depths.contains(Float16BitsColorDepthID)) {
+    if (depths.contains(Float16BitsColorDepthID)) {
         sortedDepths << Float16BitsColorDepthID;
     }
-    else if (depths.contains(Float32BitsColorDepthID)) {
+    if (depths.contains(Float32BitsColorDepthID)) {
         sortedDepths << Float32BitsColorDepthID;
     }
-    else if (depths.contains(Float64BitsColorDepthID)) {
+    if (depths.contains(Float64BitsColorDepthID)) {
         sortedDepths << Float64BitsColorDepthID;
     }
 
@@ -744,4 +744,3 @@ void KisAdvancedColorSpaceSelector::buttonUpdate()
     d->colorSpaceSelector->bnUploadProfile->setEnabled( false );
 }
 
-#include "kis_advanced_color_space_selector.moc"

krita/ui/widgets/kis_filter_selector_widget.cc

@@ -317,4 +317,3 @@ void KisFilterSelectorWidget::setVisible(bool visible)
     }
 }
 
-#include "kis_filter_selector_widget.moc"

krita/ui/widgets/kis_filter_selector_widget.h

@@ -125,7 +125,7 @@ protected:
         QTreeView::hideEvent(event);
     }
 
-private slots:
+private Q_SLOTS:
     void update_scroll_area(const QModelIndex& i)
     {
         resizeColumnToContents(i.column());

libs/basicflakes/tools/KoPencilTool.cpp

@@ -538,5 +538,3 @@ qreal KoPencilTool::getFittingError(){
 void KoPencilTool::setFittingError(qreal fittingError){
     this->m_fittingError = fittingError;
 }
-
-#include "KoPencilTool.moc"

libs/flake/KoCanvasController.cpp

@@ -158,6 +158,3 @@ KActionCollection* KoCanvasController::actionCollection() const
 {
     return d->actionCollection;
 }
-
-
-#include <KoCanvasController.moc>

libs/flake/KoCanvasControllerWidgetViewport_p.cpp

@@ -377,5 +377,3 @@ void Viewport::resetLayout()
         kDebug(30006) <<"Canvas widget geom:" << m_canvas->geometry();
 #endif
 }
-
-#include <KoCanvasControllerWidgetViewport_p.moc>

libs/flake/KoCanvasResourceManager.cpp

@@ -165,5 +165,3 @@ void KoCanvasResourceManager::clearResource(int key)
     QVariant empty;
     emit canvasResourceChanged(key, empty);
 }
-
-#include <KoCanvasResourceManager.moc>

libs/flake/KoConnectionShapeConfigWidget.cpp

@@ -71,5 +71,3 @@ KUndo2Command * KoConnectionShapeConfigWidget::createCommand()
         return new KoConnectionShapeTypeCommand(m_connection, type);
     }
 }
-
-#include <KoConnectionShapeConfigWidget.moc>

libs/flake/KoDeferredShapeFactoryBase.cpp

@@ -33,5 +33,3 @@ KoShape *KoDeferredShapeFactoryBase::createShape(const KoProperties *, KoDocumen
 {
     return createDefaultShape(documentResources);
 }
-
-#include "KoDeferredShapeFactoryBase.moc"

libs/flake/KoDocumentResourceManager.cpp

@@ -221,5 +221,3 @@ void KoDocumentResourceManager::setShapeController(KoShapeController *shapeContr
     variant.setValue<KoShapeController *>(shapeController);
     setResource(ShapeController, variant);
 }
-
-#include <KoDocumentResourceManager.moc>

libs/flake/KoInputDeviceHandler.cpp

@@ -42,5 +42,3 @@ QString KoInputDeviceHandler::id() const
 {
     return d->id;
 }
-
-#include <KoInputDeviceHandler.moc>

libs/flake/KoShapeConfigWidgetBase.cpp

@@ -51,6 +51,3 @@ KUndo2Command * KoShapeConfigWidgetBase::createCommand()
 {
     return 0;
 }
-
-#include <KoShapeConfigWidgetBase.moc>
-

libs/flake/KoShapeFactoryBase.cpp

@@ -30,10 +30,10 @@
 #include <KoOdfLoadingContext.h>
 #include <KoProperties.h>
 #include <KoStyleStack.h>
+#include <KoJsonTrader.h>
 
-#include <kservice.h>
-#include <KoServiceLocator.h>
-
+#include <KPluginFactory>
+#include <QPluginLoader>
 #include <QMutexLocker>
 #include <QMutex>
 
@@ -247,11 +247,13 @@ void KoShapeFactoryBase::getDeferredPlugin()
     QMutexLocker(&d->pluginLoadingMutex);
     if (d->deferredFactory) return;
 
-    const KService::List offers = KoServiceLocator::instance()->entries("Calligra/Deferred");
+    const QList<QPluginLoader *> offers = KoJsonTrader::self()->query("Calligra/Deferred", QString());
     Q_ASSERT(offers.size() > 0);
 
-    foreach(KService::Ptr service, offers) {
-        KoDeferredShapeFactoryBase *plugin = service->createInstance<KoDeferredShapeFactoryBase>(this);
+    foreach(QPluginLoader *pluginLoader, offers) {
+        KPluginFactory *factory = qobject_cast<KPluginFactory *>(pluginLoader->instance());
+        KoDeferredShapeFactoryBase *plugin = factory->create<KoDeferredShapeFactoryBase>(this, QVariantList());
+
         if (plugin && plugin->deferredPluginName() == d->deferredPluginName) {
             d->deferredFactory = plugin;
         }

libs/flake/KoShapeLoadingContext.cpp

 /* This file is part of the KDE project
    Copyright (C) 2007-2009, 2011 Thorsten Zachmann <zachmann@kde.org>
    Copyright (C) 2007 Jan Hambrecht <jaham@gmx.net>
-   Copyright (C) 2014 Denis Kuplyakov <dener.kup@gmail.com>
+   Copyright (C) 2014-2015 Denis Kuplyakov <dener.kup@gmail.com>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -46,7 +46,7 @@ public:
             , zIndex(0)
             , documentResources(resourceManager)
             , documentRdf(0)
-            , sectionManager(0)
+            , sectionModel(0)
     {
     }
 
@@ -66,7 +66,7 @@ public:
     QMap<KoShape *, KoLoadingShapeUpdater*> updaterByShape;
     KoDocumentResourceManager *documentResources;
     QObject *documentRdf;
-    KoSectionManager *sectionManager;
+    KoSectionModel *sectionModel;
 };
 
 KoShapeLoadingContext::KoShapeLoadingContext(KoOdfLoadingContext & context, KoDocumentResourceManager *documentResources)
@@ -210,12 +210,12 @@ void KoShapeLoadingContext::setDocumentRdf(QObject *documentRdf)
     d->documentRdf = documentRdf;
 }
 
-KoSectionManager* KoShapeLoadingContext::sectionManager()
+KoSectionModel *KoShapeLoadingContext::sectionModel()
 {
-    return d->sectionManager;
+    return d->sectionModel;
 }
 
-void KoShapeLoadingContext::setSectionManager(KoSectionManager *sectionManager)
+void KoShapeLoadingContext::setSectionModel(KoSectionModel *sectionModel)
 {
-    d->sectionManager = sectionManager;
+    d->sectionModel = sectionModel;
 }

libs/flake/KoShapeLoadingContext.h

 /* This file is part of the KDE project
    Copyright (C) 2007 Thorsten Zachmann <zachmann@kde.org>
    Copyright (C) 2007 Jan Hambrecht <jaham@gmx.net>
-   Copyright (C) 2014 Denis Kuplyakov <dener.kup@gmail.com>
+   Copyright (C) 2014-2015 Denis Kuplyakov <dener.kup@gmail.com>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -37,7 +37,7 @@ class KoLoadingShapeUpdater;
 class KoImageCollection;
 class KoSharedLoadingData;
 class KoDocumentResourceManager;
-class KoSectionManager;
+class KoSectionModel;
 
 /**
  * Context passed to shapes during loading.
@@ -191,16 +191,16 @@ public:
     void setDocumentRdf(QObject *documentRdf);
 
     /**
-     * @brief returns the current section manager
-     * @return the pointer to KoSectionManager
+     * @brief returns the current section model
+     * @return the pointer to KoSectionModel
      */
-    KoSectionManager *sectionManager();
+    KoSectionModel *sectionModel();
 
     /**
-     * @brief sets the section manager for the loading context
-     * @param sectionManager the section manager to set
+     * @brief sets the section model for the loading context
+     * @param sectionModel the section model to set
      */
-    void setSectionManager(KoSectionManager *sectionManager);
+    void setSectionModel(KoSectionModel *sectionModel);
 
 private:
     // to allow only the KoShapeRegistry access to the KoShapeBasedDocumentBase

libs/flake/KoTextShapeDataBase.cpp

@@ -85,5 +85,3 @@ KoTextShapeDataBase::ResizeMethod KoTextShapeDataBase::resizeMethod() const
     Q_D(const KoTextShapeDataBase);
     return d->resizeMethod;
 }
-
-#include <KoTextShapeDataBase.moc>

libs/flake/KoToolBase.cpp

@@ -413,5 +413,3 @@ bool KoToolBase::isInTextMode() const
     Q_D(const KoToolBase);
     return d->isInTextMode;
 }
-
-#include <KoToolBase.moc>

libs/flake/KoToolSelection.cpp

@@ -27,5 +27,3 @@ KoToolSelection::KoToolSelection(QObject *parent)
 KoToolSelection::~KoToolSelection()
 {
 }
-
-#include <KoToolSelection.moc>

libs/flake/SnapGuideConfigWidget.cpp

@@ -108,5 +108,3 @@ void SnapGuideConfigWidget::showEvent(QShowEvent * event)
     Q_UNUSED(event);
     updateControls();
 }
-
-#include <SnapGuideConfigWidget.moc>

libs/flake/tests/TestControlPointMoveCommand.cpp

@@ -255,4 +255,3 @@ void TestControlPointMoveCommand::redoUndoControlPoint2Symmetric()
 }
 
 QTEST_MAIN(TestControlPointMoveCommand)
-#include <TestControlPointMoveCommand.moc>

libs/flake/tests/TestImageCollection.cpp

@@ -308,4 +308,3 @@ void TestImageCollection::testIsValid()
 }
 
 QTEST_KDEMAIN(TestImageCollection, GUI)
-#include <TestImageCollection.moc>

libs/flake/tests/TestInputDevice.cpp

@@ -119,4 +119,3 @@ void TestInputDevice::testEraser()
 
 
 QTEST_KDEMAIN(TestInputDevice, GUI)
-#include <TestInputDevice.moc>

libs/flake/tests/TestKoShapeFactory.cpp

@@ -125,4 +125,3 @@ void TestKoShapeFactory::testOdfElement()
 }