OpenToonz - An open-source full-featured 2D animation creation software
C
#assistance: fix QuickTime includes collision
Ivan Mahoninf9be2f44858a
diff --git a/toonz/sources/common/tiio/movsettings.cpp b/toonz/sources/common/tiio/movsettings.cppindex 490405074..6c86e8d3a 100644--- a/toonz/sources/common/tiio/movsettings.cpp+++ b/toonz/sources/common/tiio/movsettings.cpp@@ -15,6 +15,8 @@// 32-bit version//*******************************************************************************+#include "movsettings.h"+#ifdef _WIN32#ifdef _MSC_VER#pragma warning(disable : 4996)@@ -95,8 +97,6 @@ esempio: buf[0] = 13 buf[1]=0 buf[2]=0 buf[3]=0 buf[4]=0 buf5]=231allora str = "13 z 4 231"*/-#include "movsettings.h"-//------------------------------------------------void visitAtoms(const QTAtomContainer &atoms, const QTAtom &parent,@@ -394,13 +394,13 @@ bool Tiio::isQuicktimeInstalled() {#include "tipc.h"#include "t32bitsrv_wrap.h"+#include "movsettings.h"+// MAC-Specific includes#ifdef MACOSX#include <ApplicationServices/ApplicationServices.h>#endif-#include "movsettings.h"-//---------------------------------------------------------------------------// Using 32-bit background server correspondence to achieve the same resultdiff --git a/toonz/sources/image/3gp/tiio_3gp.h b/toonz/sources/image/3gp/tiio_3gp.hindex c305ac216..931b09ae7 100644--- a/toonz/sources/image/3gp/tiio_3gp.h+++ b/toonz/sources/image/3gp/tiio_3gp.h@@ -7,10 +7,13 @@#include "tiio_3gp_proxy.h"#else-#include <windows.h>-+// Toonz includes#include "tlevel_io.h"#include "tthreadmessage.h"+#include "tcommon.h"++// Windows include+#include <windows.h>namespace QuickTime {#define list Listdiff --git a/toonz/sources/image/3gp/tiio_3gpM.h b/toonz/sources/image/3gp/tiio_3gpM.hindex b300ed0e6..14f8a3eaa 100644--- a/toonz/sources/image/3gp/tiio_3gpM.h+++ b/toonz/sources/image/3gp/tiio_3gpM.h@@ -9,6 +9,7 @@#include "tlevel_io.h"#include "tthread.h"+#include "tthreadmessage.h"#include <Carbon/Carbon.h>#include <QuickTime/Movies.h>@@ -16,7 +17,6 @@#include <QuickTime/QuickTimeComponents.h>#include "tquicktime.h"-#include "tthreadmessage.h"class TImageWriter3gp;class TImageReader3gp;diff --git a/toonz/sources/image/3gp/tiio_3gpW.cpp b/toonz/sources/image/3gp/tiio_3gpW.cppindex 0d4d0d8a0..553b62bae 100644--- a/toonz/sources/image/3gp/tiio_3gpW.cpp+++ b/toonz/sources/image/3gp/tiio_3gpW.cpp@@ -8,13 +8,20 @@#include "tsound.h"#include "tconvert.h"#include "tpropertytype.h"-#include "../mov/tiio_mov.h"-#include "movsettings.h"#include "trasterimage.h"#include "tsystem.h"+// movesettings deps, must be included before QuickTime includes+#include "texception.h"+#include "tpropertytype.h"+#include "tproperty.h"++// following includes may include QuickTime+#include "../mov/tiio_mov.h"#include "tiio_3gp.h"+#include "movsettings.h"+namespace {int CompressionNoneId = 0;diff --git a/toonz/sources/image/mov/tiio_mov.h b/toonz/sources/image/mov/tiio_mov.hindex 6d63b8c20..592f70acc 100644--- a/toonz/sources/image/mov/tiio_mov.h+++ b/toonz/sources/image/mov/tiio_mov.h@@ -7,14 +7,14 @@#include "tiio_mov_proxy.h"#else-// Windows include-#include <windows.h>-// Toonz includes#include "tlevel_io.h"#include "tthreadmessage.h"#include "tcommon.h"+// Windows include+#include <windows.h>+// QuickTime includesnamespace QuickTime {#define list QuickTime_listdiff --git a/toonz/sources/image/mov/tiio_movM.cpp b/toonz/sources/image/mov/tiio_movM.cppindex fe0ae2024..beb338b8b 100644--- a/toonz/sources/image/mov/tiio_movM.cpp+++ b/toonz/sources/image/mov/tiio_movM.cpp@@ -13,9 +13,14 @@#include "tmachine.h"#include "tsystem.h"-#include "movsettings.h"+// movesettings deps, must be included before QuickTime includes+#include "texception.h"+#include "tpropertytype.h"+#include "tproperty.h"+// following includes may include QuickTime#include "tiio_movM.h"+#include "movsettings.h"/* QuickDraw は 10.7 以降なくなった *///#define HAS_QUICKDRAWdiff --git a/toonz/sources/image/mov/tiio_movW.cpp b/toonz/sources/image/mov/tiio_movW.cppindex a01a76588..7bcbb439d 100644--- a/toonz/sources/image/mov/tiio_movW.cpp+++ b/toonz/sources/image/mov/tiio_movW.cpp@@ -11,6 +11,12 @@#include "../avi/tiio_avi.h"#include "trasterimage.h"+// movesettings deps, must be included before QuickTime includes+#include "texception.h"+#include "tpropertytype.h"+#include "tproperty.h"++// following includes may include QuickTime#include "tiio_mov.h"#include "movsettings.h"diff --git a/toonz/sources/image/tiio.cpp b/toonz/sources/image/tiio.cppindex 65a99a0e0..be16eca7b 100644--- a/toonz/sources/image/tiio.cpp+++ b/toonz/sources/image/tiio.cpp@@ -18,12 +18,39 @@// why (it would be included anyway though)#include <math.h>+// Common includes+#include "./quantel/tiio_quantel.h"+#include "./sgi/tiio_sgi.h"+#include "./tga/tiio_tga.h"+#include "./png/tiio_png.h"+/* Can't build this on FreeBSD: libtiff requires internal API access.+ * Probably some one get luck to fix this. */+#ifndef FREEBSD+#include "./tif/tiio_tif.h"+#include "./tzp/tiio_tzp.h"+#include "./tzp/tiio_plt.h"+#endif+#include "./psd/tiio_psd.h"+#include "./avi/tiio_avi.h"+#include "./pli/tiio_pli.h"+#include "./tzl/tiio_tzl.h"+#include "./tzm/tiio_tzm.h"+#include "./svg/tiio_svg.h"+#include "./ffmpeg/tiio_gif.h"+#include "./ffmpeg/tiio_webm.h"+#include "./ffmpeg/tiio_mp4.h"+#include "./ffmpeg/tiio_apng.h"+#include "./ffmpeg/tiio_ff_mov.h"+#include "./mesh/tiio_mesh.h"+#include "./sprite/tiio_sprite.h"+#include "./exr/tiio_exr.h"+// Platform-specific includes#if defined(_WIN32)+#include "./zcc/tiio_zcc.h"#include "./mov/tiio_mov.h"#include "./3gp/tiio_3gp.h"-#include "./zcc/tiio_zcc.h"#if !defined(x64) && !defined(__GNUC__)@@ -60,33 +87,6 @@#include "./3gp/tiio_3gp_proxy.h"#endif-// Common includes-#include "./quantel/tiio_quantel.h"-#include "./sgi/tiio_sgi.h"-#include "./tga/tiio_tga.h"-#include "./png/tiio_png.h"-/* Can't build this on FreeBSD: libtiff requires internal API access.- * Probably some one get luck to fix this. */-#ifndef FREEBSD-#include "./tif/tiio_tif.h"-#include "./tzp/tiio_tzp.h"-#include "./tzp/tiio_plt.h"-#endif-#include "./psd/tiio_psd.h"-#include "./avi/tiio_avi.h"-#include "./pli/tiio_pli.h"-#include "./tzl/tiio_tzl.h"-#include "./tzm/tiio_tzm.h"-#include "./svg/tiio_svg.h"-#include "./ffmpeg/tiio_gif.h"-#include "./ffmpeg/tiio_webm.h"-#include "./ffmpeg/tiio_mp4.h"-#include "./ffmpeg/tiio_apng.h"-#include "./ffmpeg/tiio_ff_mov.h"-#include "./mesh/tiio_mesh.h"-#include "./sprite/tiio_sprite.h"-#include "./exr/tiio_exr.h"-//-------------------------------------------------------------------// static TPluginInfo info("imageIOPlugin");diff --git a/toonz/sources/include/movsettings.h b/toonz/sources/include/movsettings.hindex ad64de92d..702a5ec44 100644--- a/toonz/sources/include/movsettings.h+++ b/toonz/sources/include/movsettings.h@@ -17,6 +17,10 @@#ifdef _WIN32+#include "texception.h"+#include "tpropertytype.h"+#include "tproperty.h"+#define list QuickTime_list#define map QuickTime_map#define iterator QuickTime_iterator@@ -44,12 +48,6 @@#undef int_fast16_t#undef uint_fast16_t-#include "texception.h"-#include "tpropertytype.h"-//#include "timageinfo.h"-//#include "tlevel_io.h"-#include "tproperty.h"-#else // _WIN32#define list Listdiff --git a/toonz/sources/t32bitsrv/t323gpmsg.cpp b/toonz/sources/t32bitsrv/t323gpmsg.cppindex 14dc606ac..57e9fd837 100644--- a/toonz/sources/t32bitsrv/t323gpmsg.cpp+++ b/toonz/sources/t32bitsrv/t323gpmsg.cpp@@ -9,15 +9,30 @@#include "trasterimage.h"#include "traster.h"#include "tstream.h"-#include "movsettings.h"#include "tproperty.h"#include "tsound.h"+// movesettings deps, must be included before QuickTime includes+#include "texception.h"+#include "tpropertytype.h"+#include "tproperty.h"++// tipc includes+#include "tipc.h"+#include "tipcmsg.h"+#include "tipcsrv.h"+#include "t32bitsrv_wrap.h"++#include "t323gpmsg.h"++// following includes may include QuickTime#if defined(_WIN32)#include "../image/3gp/tiio_3gp.h"#elif defined(MACOSX)#include "../image/3gp/tiio_3gpM.h"#endif+#include "movsettings.h"+// Qt stuff#include <QString>@@ -28,14 +43,6 @@#include <QLocalSocket>#include <QDataStream>-// tipc includes-#include "tipc.h"-#include "tipcmsg.h"-#include "tipcsrv.h"-#include "t32bitsrv_wrap.h"--#include "t323gpmsg.h"-//---------------------------------------------------// Local namespace stuffdiff --git a/toonz/sources/t32bitsrv/t32movmsg.cpp b/toonz/sources/t32bitsrv/t32movmsg.cppindex a3b2bbf1f..31b6b4d34 100644--- a/toonz/sources/t32bitsrv/t32movmsg.cpp+++ b/toonz/sources/t32bitsrv/t32movmsg.cpp@@ -9,16 +9,30 @@#include "trasterimage.h"#include "traster.h"#include "tstream.h"-#include "movsettings.h"#include "tproperty.h"#include "tsound.h"+// tipc includes+#include "tipc.h"+#include "tipcmsg.h"+#include "tipcsrv.h"+#include "t32bitsrv_wrap.h"++#include "t32movmsg.h"++// movesettings deps, must be included before QuickTime includes+#include "texception.h"+#include "tpropertytype.h"+#include "tproperty.h"++// following includes may include QuickTime#if defined(_WIN32)#include "../image/mov/tiio_mov.h"#elif defined(MACOSX)#include "../image/mov/tiio_movM.h"#include <ApplicationServices/ApplicationServices.h>#endif+#include "movsettings.h"// Qt stuff#include <QString>@@ -29,14 +43,6 @@#include <QLocalSocket>#include <QDataStream>-// tipc includes-#include "tipc.h"-#include "tipcmsg.h"-#include "tipcsrv.h"-#include "t32bitsrv_wrap.h"--#include "t32movmsg.h"-//---------------------------------------------------// Diagnostics stuffdiff --git a/toonz/sources/toonz/formatsettingspopups.cpp b/toonz/sources/toonz/formatsettingspopups.cppindex 6631a12cd..0cf67bae3 100644--- a/toonz/sources/toonz/formatsettingspopups.cpp+++ b/toonz/sources/toonz/formatsettingspopups.cpp@@ -20,10 +20,10 @@// TnzCore includes#include "tlevel_io.h"#include "tproperty.h"-#include "movsettings.h"#include "timageinfo.h"#include "tfiletype.h"#include "tiio.h"+#include "movsettings.h"// Qt includes#include <QComboBox>