Git commit 04dac642dab567fafbce117fe536053d403a3159 by Dmitry Kazakov. Committed on 07/07/2015 at 09:30. Pushed by dkazakov into branch 'calligra/2.9'.
Finish proper renaming of the libpsd library When renaming a library, please don't forget to modify the export header accordingly, because it uses a MAKE_*_LIB macro to distinguish which library is currently building. See full renaming checklist here: https://community.kde.org/Krita/docs/Rename_Library_Checklist CC:calligra-devel@kde.org M +1 -1 krita/libpsd/asl/kis_asl_callback_object_catcher.h M +1 -1 krita/libpsd/asl/kis_asl_object_catcher.h M +1 -1 krita/libpsd/asl/kis_asl_patterns_writer.h M +1 -1 krita/libpsd/asl/kis_asl_reader.h M +5 -5 krita/libpsd/asl/kis_asl_reader_utils.h M +1 -1 krita/libpsd/asl/kis_asl_writer.h M +7 -7 krita/libpsd/asl/kis_asl_writer_utils.h M +1 -1 krita/libpsd/asl/kis_asl_xml_parser.h M +1 -1 krita/libpsd/asl/kis_asl_xml_writer.h M +1 -1 krita/libpsd/compression.h M +5 -5 krita/libpsd/libkispsd_export.h M +10 -10 krita/libpsd/psd.h M +1 -1 krita/libpsd/psd_pattern.h M +20 -20 krita/libpsd/psd_utils.h http://commits.kde.org/calligra/04dac642dab567fafbce117fe536053d403a3159 diff --git a/krita/libpsd/asl/kis_asl_callback_object_catcher.h b/krita/libpsd/asl/kis_asl_callback_object_catcher.h index 33feab4..3ca3407 100644 --- a/krita/libpsd/asl/kis_asl_callback_object_catcher.h +++ b/krita/libpsd/asl/kis_asl_callback_object_catcher.h @@ -43,7 +43,7 @@ typedef boost::function<void (KoAbstractGradientSP)> ASLCallbackGradient; typedef boost::function<void ()> ASLCallbackNewStyle; -class LIBKISPSD_EXPORT KisAslCallbackObjectCatcher : public KisAslObjectCatcher +class KRITAPSD_EXPORT KisAslCallbackObjectCatcher : public KisAslObjectCatcher { public: KisAslCallbackObjectCatcher(); diff --git a/krita/libpsd/asl/kis_asl_object_catcher.h b/krita/libpsd/asl/kis_asl_object_catcher.h index 8506bb9..cca3165 100644 --- a/krita/libpsd/asl/kis_asl_object_catcher.h +++ b/krita/libpsd/asl/kis_asl_object_catcher.h @@ -31,7 +31,7 @@ class KoAbstractGradient; template<class T> class QSharedPointer; typedef QSharedPointer<KoAbstractGradient> KoAbstractGradientSP; -class LIBKISPSD_EXPORT KisAslObjectCatcher +class KRITAPSD_EXPORT KisAslObjectCatcher { public: KisAslObjectCatcher(); diff --git a/krita/libpsd/asl/kis_asl_patterns_writer.h b/krita/libpsd/asl/kis_asl_patterns_writer.h index a3d7edf..db71a25 100644 --- a/krita/libpsd/asl/kis_asl_patterns_writer.h +++ b/krita/libpsd/asl/kis_asl_patterns_writer.h @@ -27,7 +27,7 @@ class QIODevice; class KoPattern; -class LIBKISPSD_EXPORT KisAslPatternsWriter +class KRITAPSD_EXPORT KisAslPatternsWriter { public: KisAslPatternsWriter(const QDomDocument &doc, QIODevice *device); diff --git a/krita/libpsd/asl/kis_asl_reader.h b/krita/libpsd/asl/kis_asl_reader.h index dd00204..47ddada 100644 --- a/krita/libpsd/asl/kis_asl_reader.h +++ b/krita/libpsd/asl/kis_asl_reader.h @@ -25,7 +25,7 @@ class QDomDocument; class QIODevice; -class LIBKISPSD_EXPORT KisAslReader +class KRITAPSD_EXPORT KisAslReader { public: QDomDocument readFile(QIODevice *device); diff --git a/krita/libpsd/asl/kis_asl_reader_utils.h b/krita/libpsd/asl/kis_asl_reader_utils.h index 0f2f2b6..7dfc2ef 100644 --- a/krita/libpsd/asl/kis_asl_reader_utils.h +++ b/krita/libpsd/asl/kis_asl_reader_utils.h @@ -40,7 +40,7 @@ namespace KisAslReaderUtils { * most of the time, based on the offset values written in PSD. */ -struct LIBKISPSD_EXPORT ASLParseException : public std::runtime_error +struct KRITAPSD_EXPORT ASLParseException : public std::runtime_error { ASLParseException(const QString &msg) : std::runtime_error(msg.toAscii().data()) @@ -112,10 +112,10 @@ namespace KisAslReaderUtils { * - unicode string (length (4 bytes) + null-terminated unicode string (var) */ -LIBKISPSD_EXPORT QString readFixedString(QIODevice *device); -LIBKISPSD_EXPORT QString readVarString(QIODevice *device); -LIBKISPSD_EXPORT QString readPascalString(QIODevice *device); -LIBKISPSD_EXPORT QString readUnicodeString(QIODevice *device); +KRITAPSD_EXPORT QString readFixedString(QIODevice *device); +KRITAPSD_EXPORT QString readVarString(QIODevice *device); +KRITAPSD_EXPORT QString readPascalString(QIODevice *device); +KRITAPSD_EXPORT QString readUnicodeString(QIODevice *device); } diff --git a/krita/libpsd/asl/kis_asl_writer.h b/krita/libpsd/asl/kis_asl_writer.h index 79e3e22..6e1fe7a 100644 --- a/krita/libpsd/asl/kis_asl_writer.h +++ b/krita/libpsd/asl/kis_asl_writer.h @@ -25,7 +25,7 @@ class QDomDocument; class QIODevice; -class LIBKISPSD_EXPORT KisAslWriter +class KRITAPSD_EXPORT KisAslWriter { public: void writeFile(QIODevice *device, const QDomDocument &doc); diff --git a/krita/libpsd/asl/kis_asl_writer_utils.h b/krita/libpsd/asl/kis_asl_writer_utils.h index 32eaae9..5df43c9 100644 --- a/krita/libpsd/asl/kis_asl_writer_utils.h +++ b/krita/libpsd/asl/kis_asl_writer_utils.h @@ -34,7 +34,7 @@ namespace KisAslWriterUtils { /** * Exception that is emitted when any write error appear. */ -struct LIBKISPSD_EXPORT ASLWriteException : public std::runtime_error +struct KRITAPSD_EXPORT ASLWriteException : public std::runtime_error { ASLWriteException(const QString &msg) : std::runtime_error(msg.toAscii().data()) @@ -53,12 +53,12 @@ struct LIBKISPSD_EXPORT ASLWriteException : public std::runtime_error namespace KisAslWriterUtils { -LIBKISPSD_EXPORT void writeRect(const QRect &rect, QIODevice *device); -LIBKISPSD_EXPORT void writeUnicodeString(const QString &value, QIODevice *device); -LIBKISPSD_EXPORT void writeVarString(const QString &value, QIODevice *device); -LIBKISPSD_EXPORT void writePascalString(const QString &value, QIODevice *device); -LIBKISPSD_EXPORT void writeFixedString(const QString &value, QIODevice *device); -LIBKISPSD_EXPORT QString getPatternUuidLazy(const KoPattern *pattern); +KRITAPSD_EXPORT void writeRect(const QRect &rect, QIODevice *device); +KRITAPSD_EXPORT void writeUnicodeString(const QString &value, QIODevice *device); +KRITAPSD_EXPORT void writeVarString(const QString &value, QIODevice *device); +KRITAPSD_EXPORT void writePascalString(const QString &value, QIODevice *device); +KRITAPSD_EXPORT void writeFixedString(const QString &value, QIODevice *device); +KRITAPSD_EXPORT QString getPatternUuidLazy(const KoPattern *pattern); /** * Align the pointer \p pos by alignment. Grow the pointer diff --git a/krita/libpsd/asl/kis_asl_xml_parser.h b/krita/libpsd/asl/kis_asl_xml_parser.h index 6dc9109..bd01c1b 100644 --- a/krita/libpsd/asl/kis_asl_xml_parser.h +++ b/krita/libpsd/asl/kis_asl_xml_parser.h @@ -26,7 +26,7 @@ class QIODevice; class KisAslObjectCatcher; -class LIBKISPSD_EXPORT KisAslXmlParser +class KRITAPSD_EXPORT KisAslXmlParser { public: void parseXML(const QDomDocument &doc, KisAslObjectCatcher &catcher); diff --git a/krita/libpsd/asl/kis_asl_xml_writer.h b/krita/libpsd/asl/kis_asl_xml_writer.h index 8f863b3..715dbe5 100644 --- a/krita/libpsd/asl/kis_asl_xml_writer.h +++ b/krita/libpsd/asl/kis_asl_xml_writer.h @@ -33,7 +33,7 @@ class KoStopGradient; class KoSegmentGradient; -class LIBKISPSD_EXPORT KisAslXmlWriter +class KRITAPSD_EXPORT KisAslXmlWriter { public: KisAslXmlWriter(); diff --git a/krita/libpsd/compression.h b/krita/libpsd/compression.h index 8b8f050..f069ac2 100644 --- a/krita/libpsd/compression.h +++ b/krita/libpsd/compression.h @@ -21,7 +21,7 @@ #include <QByteArray> #include "libkispsd_export.h" -class LIBKISPSD_EXPORT Compression +class KRITAPSD_EXPORT Compression { public: diff --git a/krita/libpsd/libkispsd_export.h b/krita/libpsd/libkispsd_export.h index ad36230..fa028e7 100644 --- a/krita/libpsd/libkispsd_export.h +++ b/krita/libpsd/libkispsd_export.h @@ -26,19 +26,19 @@ /* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */ #if defined _WIN32 || defined _WIN64 -#ifndef LIBKISPSD_EXPORT -# if defined(MAKE_LIBKISPSD_LIB) +#ifndef KRITAPSD_EXPORT +# if defined(MAKE_KRITAPSD_LIB) /* We are building this library */ -# define LIBKISPSD_EXPORT KDE_EXPORT +# define KRITAPSD_EXPORT KDE_EXPORT # else /* We are using this library */ -# define LIBKISPSD_EXPORT KDE_IMPORT +# define KRITAPSD_EXPORT KDE_IMPORT # endif #endif #else /* UNIX */ -#define LIBKISPSD_EXPORT KDE_EXPORT +#define KRITAPSD_EXPORT KDE_EXPORT #endif diff --git a/krita/libpsd/psd.h b/krita/libpsd/psd.h index ac3ee9e..226a9c2 100644 --- a/krita/libpsd/psd.h +++ b/krita/libpsd/psd.h @@ -230,7 +230,7 @@ struct psd_layer_effects_context { #define PSD_LOOKUP_TABLE_SIZE 256 // dsdw, isdw: http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/PhotoshopFileFormats.htm#50577409_22203 -class LIBKISPSD_EXPORT psd_layer_effects_shadow_base { +class KRITAPSD_EXPORT psd_layer_effects_shadow_base { public: psd_layer_effects_shadow_base() : m_invertsSelection(false) @@ -466,7 +466,7 @@ private: KoAbstractGradientSP m_gradient; }; -class LIBKISPSD_EXPORT psd_layer_effects_shadow_common : public psd_layer_effects_shadow_base +class KRITAPSD_EXPORT psd_layer_effects_shadow_common : public psd_layer_effects_shadow_base { public: /// FIXME: 'using' is not supported by MSVC, so please refactor in @@ -486,7 +486,7 @@ public: // using psd_layer_effects_shadow_base::setNoise; }; -class LIBKISPSD_EXPORT psd_layer_effects_drop_shadow : public psd_layer_effects_shadow_common +class KRITAPSD_EXPORT psd_layer_effects_drop_shadow : public psd_layer_effects_shadow_common { public: /// FIXME: 'using' is not supported by MSVC, so please refactor in @@ -497,7 +497,7 @@ public: }; // isdw: http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/PhotoshopFileFormats.htm#50577409_22203 -class LIBKISPSD_EXPORT psd_layer_effects_inner_shadow : public psd_layer_effects_shadow_common +class KRITAPSD_EXPORT psd_layer_effects_inner_shadow : public psd_layer_effects_shadow_common { public: psd_layer_effects_inner_shadow() { @@ -507,7 +507,7 @@ public: } }; -class LIBKISPSD_EXPORT psd_layer_effects_glow_common : public psd_layer_effects_shadow_base +class KRITAPSD_EXPORT psd_layer_effects_glow_common : public psd_layer_effects_shadow_base { public: psd_layer_effects_glow_common() { @@ -539,12 +539,12 @@ public: }; // oglw: http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/PhotoshopFileFormats.htm#50577409_25738 -class LIBKISPSD_EXPORT psd_layer_effects_outer_glow : public psd_layer_effects_glow_common +class KRITAPSD_EXPORT psd_layer_effects_outer_glow : public psd_layer_effects_glow_common { }; // iglw: http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/PhotoshopFileFormats.htm#50577409_27692 -class LIBKISPSD_EXPORT psd_layer_effects_inner_glow : public psd_layer_effects_glow_common +class KRITAPSD_EXPORT psd_layer_effects_inner_glow : public psd_layer_effects_glow_common { public: psd_layer_effects_inner_glow() @@ -1144,13 +1144,13 @@ private: * * @return a QPair containing ColorModelId and ColorDepthID */ -QPair<QString, QString> LIBKISPSD_EXPORT psd_colormode_to_colormodelid(psd_color_mode colormode, quint16 channelDepth); +QPair<QString, QString> KRITAPSD_EXPORT psd_colormode_to_colormodelid(psd_color_mode colormode, quint16 channelDepth); /** * Convert the Photoshop blend mode strings to Pigment compositeop id's */ -QString LIBKISPSD_EXPORT psd_blendmode_to_composite_op(const QString& blendmode); -QString LIBKISPSD_EXPORT composite_op_to_psd_blendmode(const QString& compositeOp); +QString KRITAPSD_EXPORT psd_blendmode_to_composite_op(const QString& blendmode); +QString KRITAPSD_EXPORT composite_op_to_psd_blendmode(const QString& compositeOp); #endif // PSD_H diff --git a/krita/libpsd/psd_pattern.h b/krita/libpsd/psd_pattern.h index c1b0a2b..00d0283 100644 --- a/krita/libpsd/psd_pattern.h +++ b/krita/libpsd/psd_pattern.h @@ -22,7 +22,7 @@ #include <QIODevice> #include <KoPattern.h> -class LIBKISPSD_EXPORT PsdPattern +class KRITAPSD_EXPORT PsdPattern { public: PsdPattern(); diff --git a/krita/libpsd/psd_utils.h b/krita/libpsd/psd_utils.h index 1df59d3..607f772 100644 --- a/krita/libpsd/psd_utils.h +++ b/krita/libpsd/psd_utils.h @@ -28,26 +28,26 @@ class QIODevice; class QString; -bool LIBKISPSD_EXPORT psdwrite(QIODevice* io, quint8 v); -bool LIBKISPSD_EXPORT psdwrite(QIODevice* io, quint16 v); -bool LIBKISPSD_EXPORT psdwrite(QIODevice* io, qint16 v); -bool LIBKISPSD_EXPORT psdwrite(QIODevice* io, quint32 v); -bool LIBKISPSD_EXPORT psdwrite(QIODevice* io, const QString &s); -bool LIBKISPSD_EXPORT psdwrite(QIODevice* io, double v); -bool LIBKISPSD_EXPORT psdwrite_pascalstring(QIODevice* io, const QString &s); -bool LIBKISPSD_EXPORT psdwrite_pascalstring(QIODevice* io, const QString &s, int padding); -bool LIBKISPSD_EXPORT psdpad(QIODevice* io, quint32 padding); - -bool LIBKISPSD_EXPORT psdread(QIODevice* io, quint8* v); -bool LIBKISPSD_EXPORT psdread(QIODevice* io, quint16* v); -bool LIBKISPSD_EXPORT psdread(QIODevice* io, qint16* v); -bool LIBKISPSD_EXPORT psdread(QIODevice* io, quint32* v); -bool LIBKISPSD_EXPORT psdread(QIODevice* io, qint32* v); -bool LIBKISPSD_EXPORT psdread(QIODevice* io, quint64* v); -bool LIBKISPSD_EXPORT psdread(QIODevice* io, double* v); -bool LIBKISPSD_EXPORT psdread_pascalstring(QIODevice* io, QString& s, int padding); -bool LIBKISPSD_EXPORT psdread_unicodestring(QIODevice* io, QString &s); -bool LIBKISPSD_EXPORT psd_read_blendmode(QIODevice* io, QString &blendModeKey); +bool KRITAPSD_EXPORT psdwrite(QIODevice* io, quint8 v); +bool KRITAPSD_EXPORT psdwrite(QIODevice* io, quint16 v); +bool KRITAPSD_EXPORT psdwrite(QIODevice* io, qint16 v); +bool KRITAPSD_EXPORT psdwrite(QIODevice* io, quint32 v); +bool KRITAPSD_EXPORT psdwrite(QIODevice* io, const QString &s); +bool KRITAPSD_EXPORT psdwrite(QIODevice* io, double v); +bool KRITAPSD_EXPORT psdwrite_pascalstring(QIODevice* io, const QString &s); +bool KRITAPSD_EXPORT psdwrite_pascalstring(QIODevice* io, const QString &s, int padding); +bool KRITAPSD_EXPORT psdpad(QIODevice* io, quint32 padding); + +bool KRITAPSD_EXPORT psdread(QIODevice* io, quint8* v); +bool KRITAPSD_EXPORT psdread(QIODevice* io, quint16* v); +bool KRITAPSD_EXPORT psdread(QIODevice* io, qint16* v); +bool KRITAPSD_EXPORT psdread(QIODevice* io, quint32* v); +bool KRITAPSD_EXPORT psdread(QIODevice* io, qint32* v); +bool KRITAPSD_EXPORT psdread(QIODevice* io, quint64* v); +bool KRITAPSD_EXPORT psdread(QIODevice* io, double* v); +bool KRITAPSD_EXPORT psdread_pascalstring(QIODevice* io, QString& s, int padding); +bool KRITAPSD_EXPORT psdread_unicodestring(QIODevice* io, QString &s); +bool KRITAPSD_EXPORT psd_read_blendmode(QIODevice* io, QString &blendModeKey); #endif // PSD_UTILS_H _______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
