[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/krita-scripting-rempt] krita/plugins/extensions/pykrita: fix compilation
From: Cyrille Berger <cberger () cberger ! net>
Date: 2015-05-03 15:01:30
Message-ID: E1YovOc-0004eg-HO () scm ! kde ! org
[Download RAW message or body]
Git commit b641c9d8f021bc1740153cbc2e2217fbc87b2ca4 by Cyrille Berger.
Committed on 03/05/2015 at 15:00.
Pushed by berger into branch 'krita-scripting-rempt'.
fix compilation
M +6 -4 krita/plugins/extensions/pykrita/CMakeLists.txt
M +3 -3 krita/plugins/extensions/pykrita/libkis/document.cpp
M +4 -4 krita/plugins/extensions/pykrita/libkis/document.h
M +11 -31 krita/plugins/extensions/pykrita/libkis/krita.cpp
M +4 -14 krita/plugins/extensions/pykrita/libkis/mainwindow.cpp
M +3 -4 krita/plugins/extensions/pykrita/libkis/mainwindow.h
M +3 -3 krita/plugins/extensions/pykrita/libkis/view.cpp
M +3 -3 krita/plugins/extensions/pykrita/libkis/view.h
M +1 -2 krita/plugins/extensions/pykrita/sip/krita/document.sip
M +1 -2 krita/plugins/extensions/pykrita/sip/krita/image.sip
M +1 -3 krita/plugins/extensions/pykrita/sip/krita/mainwindow.sip
M +2 -2 krita/plugins/extensions/pykrita/sip/krita/view.sip
M +1 -1 krita/plugins/extensions/pykrita/src/CMakeLists.txt
M +2 -2 krita/plugins/extensions/pykrita/src/engine.h
M +1 -2 krita/plugins/extensions/pykrita/src/plugin.cpp
M +2 -2 krita/plugins/extensions/pykrita/src/plugin.h
M +5 -5 krita/plugins/extensions/pykrita/src/plugins/CMakeLists.txt
M +1 -1 krita/plugins/extensions/pykrita/src/pyqtpluginsettings.cpp
http://commits.kde.org/calligra/b641c9d8f021bc1740153cbc2e2217fbc87b2ca4
diff --git a/krita/plugins/extensions/pykrita/CMakeLists.txt \
b/krita/plugins/extensions/pykrita/CMakeLists.txt index 45b6329..a5e74d4 100644
--- a/krita/plugins/extensions/pykrita/CMakeLists.txt
+++ b/krita/plugins/extensions/pykrita/CMakeLists.txt
@@ -1,3 +1,5 @@
+
+set(Python_ADDITIONAL_VERSIONS 3.0 3.1 3.2 3.3 3.4 3.5 3.6)
macro_optional_find_package(PythonLibrary)
macro_log_feature(PYTHON_LIBRARY "PythonLibrary" "Python Library" FALSE "" "Required by the \
Krita PyQt plugin") macro_bool_to_01(PYTHONLIBS_FOUND HAVE_PYTHONLIBS)
@@ -12,10 +14,10 @@ macro_bool_to_01(PYQT4_FOUND HAVE_PYQT4)
if (HAVE_PYQT4 AND HAVE_SIP AND HAVE_PYTHONLIBS)
-if (NOT EXISTS ${PYQT4_SIP_DIR}/QtCore/QtCoremod.sip)
- message(WARNING "krita-pykrita plugin needs the PyQt4 development sip file QtCoremod.sip")
- return()
-endif()
+# if (NOT EXISTS ${PYQT4_SIP_DIR}/QtCore/QtCoremod.sip)
+# message(WARNING "krita-pykrita plugin needs the PyQt4 development sip file \
QtCoremod.sip") +# return()
+# endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SIP_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH})
diff --git a/krita/plugins/extensions/pykrita/libkis/document.cpp \
b/krita/plugins/extensions/pykrita/libkis/document.cpp index dd573f3..130bbc9 100644
--- a/krita/plugins/extensions/pykrita/libkis/document.cpp
+++ b/krita/plugins/extensions/pykrita/libkis/document.cpp
@@ -18,11 +18,11 @@
#include "document.h"
#include "image.h"
-#include <kis_doc2.h>
+#include <KisDocument.h>
-Document::Document(QObject *document, QObject *parent)
+Document::Document(KisDocument *document, QObject *parent)
: QObject(parent)
- , m_document(qobject_cast<KisDoc2*>(document))
+ , m_document(document)
{
}
diff --git a/krita/plugins/extensions/pykrita/libkis/document.h \
b/krita/plugins/extensions/pykrita/libkis/document.h index da1bf2b..dbf343c 100644
--- a/krita/plugins/extensions/pykrita/libkis/document.h
+++ b/krita/plugins/extensions/pykrita/libkis/document.h
@@ -18,17 +18,17 @@
#ifndef LIBKIS_DOCUMENT_H
#define LIBKIS_DOCUMENT_H
-#include <QObject>
#include <krita_export.h>
+#include <QPointer>
-class KisDoc2;
+class KisDocument;
class Image;
class LIBKIS_EXPORT Document : public QObject
{
Q_OBJECT
public:
- explicit Document(QObject *document, QObject *parent = 0);
+ explicit Document(KisDocument *document, QObject *parent = 0);
Image *image();
@@ -37,7 +37,7 @@ signals:
public slots:
private:
- KisDoc2 *m_document;
+ QPointer<KisDocument> m_document;
};
#endif // LIBKIS_DOCUMENT_H
diff --git a/krita/plugins/extensions/pykrita/libkis/krita.cpp \
b/krita/plugins/extensions/pykrita/libkis/krita.cpp index c7a6905..064346d 100644
--- a/krita/plugins/extensions/pykrita/libkis/krita.cpp
+++ b/krita/plugins/extensions/pykrita/libkis/krita.cpp
@@ -17,12 +17,10 @@
*/
#include "krita.h"
-#include <KoApplication.h>
-#include <KoPart.h>
-#include <KoMainWindow.h>
+#include <KisPart.h>
-#include <kis_view2.h>
-#include <kis_doc2.h>
+#include <KisViewManager.h>
+#include <KisDocument.h>
#include <kis_image.h>
#include <kis_action.h>
#include <kis_script_manager.h>
@@ -35,12 +33,8 @@ Krita::Krita(QObject *parent) :
QList<MainWindow *> Krita::mainWindows()
{
QList<MainWindow *> ret;
- foreach(KoPart *part, koApp->partList()) {
- if (part) {
- foreach(KoMainWindow *mainWin, part->mainWindows()) {
- ret << new MainWindow(mainWin, this);
- }
- }
+ foreach(QPointer<KisMainWindow> mainWin, KisPart::instance()->mainWindows()) {
+ ret << new MainWindow(mainWin, this);
}
return ret;
}
@@ -48,8 +42,8 @@ QList<MainWindow *> Krita::mainWindows()
QList<View *> Krita::views()
{
QList<View *> ret;
- foreach(MainWindow *mainWin, mainWindows()) {
- ret << mainWin->views();
+ foreach(QPointer<KisView> view, KisPart::instance()->views()) {
+ ret << new View(view, this);
}
return ret;
}
@@ -57,13 +51,8 @@ QList<View *> Krita::views()
QList<Document *> Krita::documents()
{
QList<Document *> ret;
- foreach(KoPart *part, koApp->partList()) {
- if (part) {
- KisDoc2 *doc = qobject_cast<KisDoc2*>(part->document());
- if (doc) {
- ret << new Document(doc, this);
- }
- }
+ foreach(QPointer<KisDocument> doc, KisPart::instance()->documents()) {
+ ret << new Document(doc, this);
}
return ret;
@@ -81,17 +70,8 @@ QList<Image *> Krita::images()
QAction *Krita::createAction(const QString &text)
{
KisAction *action = new KisAction(text, this);
- foreach(KoPart *part, koApp->partList()) {
- if (part) {
- foreach(KoMainWindow *mainWin, part->mainWindows()) {
- if (mainWin && mainWin->rootView()) {
- KisView2 *view = qobject_cast<KisView2*>(view);
- if (view) {
- view->scriptManager()->addAction(action);
- }
- }
- }
- }
+ foreach(KisMainWindow *mainWin, KisPart::instance()->mainWindows()) {
+ mainWin->viewManager()->scriptManager()->addAction(action);
}
return action;
}
diff --git a/krita/plugins/extensions/pykrita/libkis/mainwindow.cpp \
b/krita/plugins/extensions/pykrita/libkis/mainwindow.cpp index 8166679..69ca89c 100644
--- a/krita/plugins/extensions/pykrita/libkis/mainwindow.cpp
+++ b/krita/plugins/extensions/pykrita/libkis/mainwindow.cpp
@@ -17,23 +17,13 @@
*/
#include "mainwindow.h"
-#include <KoMainWindow.h>
-#include <kis_view2.h>
+#include <KisMainWindow.h>
+#include <KisViewManager.h>
#include "view.h"
-MainWindow::MainWindow(QObject *mainWin, QObject *parent)
+MainWindow::MainWindow(KisMainWindow *mainWin, QObject *parent)
: QObject(parent)
- , m_mainWindow(qobject_cast<KoMainWindow*>(mainWin))
+ , m_mainWindow(mainWin)
{
}
-
-QList<View *> MainWindow::views()
-{
- QList<View*> ret;
- KisView2 *view = qobject_cast<KisView2*>(m_mainWindow->rootView());
- if (view) {
- ret << new View(view, this);
- }
- return ret;
-}
diff --git a/krita/plugins/extensions/pykrita/libkis/mainwindow.h \
b/krita/plugins/extensions/pykrita/libkis/mainwindow.h index 6e06a53..ba4e58d 100644
--- a/krita/plugins/extensions/pykrita/libkis/mainwindow.h
+++ b/krita/plugins/extensions/pykrita/libkis/mainwindow.h
@@ -20,7 +20,7 @@
#include <QObject>
#include <krita_export.h>
-class KoMainWindow;
+class KisMainWindow;
#include <view.h>
@@ -28,9 +28,8 @@ class LIBKIS_EXPORT MainWindow : public QObject
{
Q_OBJECT
public:
- explicit MainWindow(QObject *mainWin, QObject *parent = 0);
+ explicit MainWindow(KisMainWindow *mainWin, QObject *parent = 0);
- QList<View*> views();
signals:
public slots:
@@ -38,7 +37,7 @@ public slots:
private:
- KoMainWindow *m_mainWindow;
+ KisMainWindow *m_mainWindow;
};
#endif // MAINWINDOW_H
diff --git a/krita/plugins/extensions/pykrita/libkis/view.cpp \
b/krita/plugins/extensions/pykrita/libkis/view.cpp index 09ca699..22c34cc 100644
--- a/krita/plugins/extensions/pykrita/libkis/view.cpp
+++ b/krita/plugins/extensions/pykrita/libkis/view.cpp
@@ -17,10 +17,10 @@
*/
#include "view.h"
-#include <kis_view2.h>
+#include <KisView.h>
-View::View(QObject *view, QObject *parent)
+View::View(KisView *view, QObject *parent)
: QObject(parent)
- , m_view(qobject_cast<KisView2*>(view))
+ , m_view(view)
{
}
diff --git a/krita/plugins/extensions/pykrita/libkis/view.h \
b/krita/plugins/extensions/pykrita/libkis/view.h index f2ecdef..2d7aaa1 100644
--- a/krita/plugins/extensions/pykrita/libkis/view.h
+++ b/krita/plugins/extensions/pykrita/libkis/view.h
@@ -22,13 +22,13 @@
#include <krita_export.h>
-class KisView2;
+class KisView;
class LIBKIS_EXPORT View : public QObject
{
Q_OBJECT
public:
- explicit View(QObject *view, QObject *parent = 0);
+ explicit View(KisView *view, QObject *parent = 0);
signals:
@@ -36,7 +36,7 @@ public slots:
private:
- KisView2 *m_view;
+ KisView *m_view;
};
diff --git a/krita/plugins/extensions/pykrita/sip/krita/document.sip \
b/krita/plugins/extensions/pykrita/sip/krita/document.sip index 8a3acc7..52b4767 100644
--- a/krita/plugins/extensions/pykrita/sip/krita/document.sip
+++ b/krita/plugins/extensions/pykrita/sip/krita/document.sip
@@ -1,14 +1,13 @@
%Import QtCore/QtCoremod.sip
%Import QtGui/QtGuimod.sip
-class Document : public QObject
+class Document : public QObject /NoDefaultCtors/
{
%TypeHeaderCode
#include "document.h"
%End
public:
- explicit Document(QObject *document, QObject *parent /TransferThis/ = 0);
Image *image();
};
diff --git a/krita/plugins/extensions/pykrita/sip/krita/image.sip \
b/krita/plugins/extensions/pykrita/sip/krita/image.sip index 8789487..a68bcb5 100644
--- a/krita/plugins/extensions/pykrita/sip/krita/image.sip
+++ b/krita/plugins/extensions/pykrita/sip/krita/image.sip
@@ -1,13 +1,12 @@
%Import QtCore/QtCoremod.sip
%Import QtGui/QtGuimod.sip
-class Image : public QObject
+class Image : public QObject /NoDefaultCtors/
{
%TypeHeaderCode
#include "image.h"
%End
public:
- explicit Image(QObject *image, QObject *parent /TransferThis/ = 0);
};
diff --git a/krita/plugins/extensions/pykrita/sip/krita/mainwindow.sip \
b/krita/plugins/extensions/pykrita/sip/krita/mainwindow.sip index de07570..f729696 100644
--- a/krita/plugins/extensions/pykrita/sip/krita/mainwindow.sip
+++ b/krita/plugins/extensions/pykrita/sip/krita/mainwindow.sip
@@ -2,13 +2,11 @@
%Import QtGui/QtGuimod.sip
-class MainWindow : public QObject
+class MainWindow : public QObject /NoDefaultCtors/
{
%TypeHeaderCode
#include "mainwindow.h"
%End
public:
- MainWindow(QObject *mainWin, QObject *parent /TransferThis/ = 0);
- QList<View*> views();
};
diff --git a/krita/plugins/extensions/pykrita/sip/krita/view.sip \
b/krita/plugins/extensions/pykrita/sip/krita/view.sip index b8ddd57..961fd4b 100644
--- a/krita/plugins/extensions/pykrita/sip/krita/view.sip
+++ b/krita/plugins/extensions/pykrita/sip/krita/view.sip
@@ -1,13 +1,13 @@
%Import QtCore/QtCoremod.sip
%Import QtGui/QtGuimod.sip
-class View : public QObject
+class View : public QObject /NoDefaultCtors/
{
%TypeHeaderCode
#include "view.h"
%End
public:
- explicit View(QObject *view, QObject *parent /TransferThis/ = 0);
+// explicit View(QObject *view, QObject *parent /TransferThis/ = 0);
};
diff --git a/krita/plugins/extensions/pykrita/src/CMakeLists.txt \
b/krita/plugins/extensions/pykrita/src/CMakeLists.txt index a1c7b57..935bf9c 100644
--- a/krita/plugins/extensions/pykrita/src/CMakeLists.txt
+++ b/krita/plugins/extensions/pykrita/src/CMakeLists.txt
@@ -1,6 +1,6 @@
# NOTE Disable trivial Qt keywords due conflicts w/ some Python.h header
# (at least version 3.3 of it has a member PyType_Spec::slots)
-#add_definitions(-DQT_NO_KEYWORDS)
+add_definitions(-DQT_NO_KEYWORDS)
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
set(SOURCES
diff --git a/krita/plugins/extensions/pykrita/src/engine.h \
b/krita/plugins/extensions/pykrita/src/engine.h index 4de0e51..8d981cc 100644
--- a/krita/plugins/extensions/pykrita/src/engine.h
+++ b/krita/plugins/extensions/pykrita/src/engine.h
@@ -24,13 +24,13 @@
#ifndef __PYKRITA_ENGINE_H__
# define __PYKRITA_ENGINE_H__
+# include <Python.h>
+
# include "version_checker.h"
# include <kservice.h>
# include <kurl.h>
-# include <Python.h>
-
# include <QAbstractItemModel>
# include <QList>
# include <QStringList>
diff --git a/krita/plugins/extensions/pykrita/src/plugin.cpp \
b/krita/plugins/extensions/pykrita/src/plugin.cpp index 9aba275..d5fa2cc 100644
--- a/krita/plugins/extensions/pykrita/src/plugin.cpp
+++ b/krita/plugins/extensions/pykrita/src/plugin.cpp
@@ -23,7 +23,6 @@
#include <kis_debug.h>
#include <kpluginfactory.h>
-#include <kis_view2.h>
#include <kis_preference_set_registry.h>
#include <pyqtpluginsettings.h>
@@ -31,7 +30,7 @@ K_PLUGIN_FACTORY(KritaPyQtPluginFactory, registerPlugin<KritaPyQtPlugin>();)
K_EXPORT_PLUGIN(KritaPyQtPluginFactory("krita"))
KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
- : KisViewPlugin(parent, "kritaplugins/kritapykritaplugin.rc")
+ : KisViewPlugin(parent)
, m_engineFailureReason(m_engine.tryInitializeGetFailureReason())
, m_autoReload(false)
{
diff --git a/krita/plugins/extensions/pykrita/src/plugin.h \
b/krita/plugins/extensions/pykrita/src/plugin.h index 8613769..0808673 100644
--- a/krita/plugins/extensions/pykrita/src/plugin.h
+++ b/krita/plugins/extensions/pykrita/src/plugin.h
@@ -18,10 +18,10 @@
#ifndef _PYQT_PLUGIN_H_
#define _PYQT_PLUGIN_H_
-#include <QObject>
-
#include <Python.h>
+#include <QObject>
+
#include <kis_view_plugin.h>
#include "engine.h"
diff --git a/krita/plugins/extensions/pykrita/src/plugins/CMakeLists.txt \
b/krita/plugins/extensions/pykrita/src/plugins/CMakeLists.txt index 0b4de3f..84c738d 100644
--- a/krita/plugins/extensions/pykrita/src/plugins/CMakeLists.txt
+++ b/krita/plugins/extensions/pykrita/src/plugins/CMakeLists.txt
@@ -74,11 +74,11 @@ endfunction()
install_pykrita_plugin(hello)
-if(PYTHON_VERSION_MAJOR VERSION_EQUAL 3)
- install_pykrita_plugin(cmake_utils)
- install_pykrita_plugin(js_utils PATTERNS "*.json")
- install_pykrita_plugin(expand PATTERNS "*.expand" "templates/*.tpl")
-endif()
+# if(PYTHON_VERSION_MAJOR VERSION_EQUAL 3)
+# install_pykrita_plugin(cmake_utils)
+# install_pykrita_plugin(js_utils PATTERNS "*.json")
+# install_pykrita_plugin(expand PATTERNS "*.expand" "templates/*.tpl")
+# endif()
install(
DIRECTORY libkritapykrita
diff --git a/krita/plugins/extensions/pykrita/src/pyqtpluginsettings.cpp \
b/krita/plugins/extensions/pykrita/src/pyqtpluginsettings.cpp index 589b2a4..69c49da 100644
--- a/krita/plugins/extensions/pykrita/src/pyqtpluginsettings.cpp
+++ b/krita/plugins/extensions/pykrita/src/pyqtpluginsettings.cpp
@@ -78,7 +78,7 @@ KIcon PyQtPluginSettings::icon()
void PyQtPluginSettings::savePreferences() const
{
- emit settingsChanged();
+ Q_EMIT(settingsChanged());
}
void PyQtPluginSettings::loadPreferences()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic