razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix/reduce-boost-dependencies

Browse source 
# Conflicts:
#	toonz/sources/include/tfarmtask.h
This commit is contained in:
Shinya Kitaoka 2016-04-15 14:28:42 +09:00
commit a85aeb719a
57 changed files with 110 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/common/tcore/tthread.cpp
View file

@ -10,7 +10,7 @@
#include "tatomicvar.h" #include "tatomicvar.h"
#include "tthread.h" #include "tthread.h"
#include "tthreadP.h" #include "tthreadp.h"
// STL includes // STL includes
#include <set> #include <set>

4
toonz/sources/common/tfx/ttzpimagefx.cpp
View file

@ -11,7 +11,7 @@
void parseIndexes(string indexes, vector<string> &items) void parseIndexes(string indexes, vector<string> &items)
{ {
#ifndef MACOSX #ifdef WIN32
char seps[] = " ,;"; char seps[] = " ,;";
char *token; char *token;
if (indexes == "all" || indexes == "All" || indexes == "ALL") if (indexes == "all" || indexes == "All" || indexes == "ALL")
@ -39,7 +39,7 @@ void parseIndexes(string indexes, vector<string> &items)
void insertIndexes(vector<string> items, PaletteFilterFxRenderData *t) void insertIndexes(vector<string> items, PaletteFilterFxRenderData *t)
{ {
#ifndef MACOSX #ifdef WIN32
for (int i = 0; i < (int)items.size(); i++) { for (int i = 0; i < (int)items.size(); i++) {
char *starttoken, *endtoken; char *starttoken, *endtoken;
char subseps[] = "-"; char subseps[] = "-";

4
toonz/sources/common/tgl/tgl.cpp
View file

@ -11,12 +11,14 @@
#ifndef __sgi #ifndef __sgi
#ifdef WIN32 #ifdef WIN32
#include <GL/glut.h> #include <GL/glut.h>
#elif defined(LINUX)
#include <GL/glut.h>
#else #else
#include <GLUT/glut.h> #include <GLUT/glut.h>
#endif #endif
#endif #endif
#ifdef MACOSX #if defined(MACOSX) || defined(LINUX)
#include <QGLContext> #include <QGLContext>
#endif #endif

2
toonz/sources/common/tiio/compatibility/tfile_io.h
View file

@ -9,7 +9,7 @@ extern "C" {
#include <stdio.h> #include <stdio.h>
#ifdef MACOSX #if defined(MACOSX) || defined(LINUX)
#include <stddef.h> #include <stddef.h>
#endif #endif

3
toonz/sources/common/tipc/tipc.cpp
View file

@ -18,6 +18,9 @@
#elif MACOSX #elif MACOSX
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <unistd.h> #include <unistd.h>
#elif LINUX
#include <sys/time.h>
#include <unistd.h>
#endif #endif
#include "tipc.h" #include "tipc.h"

2
toonz/sources/common/tsystem/tlogger.cpp
View file

@ -8,7 +8,7 @@
#include <fstream> #include <fstream>
#include <set> #include <set>
#include <vector> #include <vector>
#include <qtime> #include <QTimer>
using std::endl; using std::endl;

4
toonz/sources/common/tsystem/tpluginmanager.cpp
View file

@ -21,7 +21,9 @@
#include <dirent.h> #include <dirent.h>
#include <sys/dir.h> #include <sys/dir.h>
#include <sys/param.h> // for getfsstat #include <sys/param.h> // for getfsstat
#ifdef MACOSX
#include <sys/ucred.h> #include <sys/ucred.h>
#endif
#include <sys/mount.h> #include <sys/mount.h>
#include <pwd.h> #include <pwd.h>
#include <dlfcn.h> #include <dlfcn.h>
@ -63,7 +65,7 @@ typedef const TPluginInfo *TnzLibMainProcType();
namespace namespace
{ {
const char *TnzLibMainProcName = "TLibMain"; const char *TnzLibMainProcName = "TLibMain";
#ifdef MACOSX #if !defined(WIN32)
const char *TnzLibMainProcName2 = "_TLibMain"; const char *TnzLibMainProcName2 = "_TLibMain";
#endif #endif
} }

28
toonz/sources/common/tsystem/tsystem.cpp
View file

@ -10,26 +10,26 @@ using namespace std;
#ifndef TNZCORE_LIGHT #ifndef TNZCORE_LIGHT
#include <qdatetime> #include <QDateTime>
#include <qstringlist> #include <QStringList>
#include <qprocess> #include <QProcess>
#include <qdir> #include <QDir>
#include <qfile> #include <QFile>
#include <qfileinfo> #include <QFileInfo>
#include <qsettings> #include <QSettings>
#include <qvariant> #include <QVariant>
#include <qthread> #include <QThread>
#include <qurl> #include <QUrl>
#include <qcoreapplication> #include <QCoreApplication>
#include <quuid.h> #include <QUuid>
#ifdef WIN32 #ifdef WIN32
#include <qdesktopservices> #include <qdesktopservices>
#include <qhostinfo> #include <qhostinfo>
#include <shlobj.h> #include <shlobj.h>
#else #else
#include <qdesktopservices> #include <QDesktopServices>
#include <qhostinfo> #include <QHostInfo>
#endif #endif
#include <QStringList> #include <QStringList>

5
toonz/sources/common/tsystem/tsystempd.cpp
View file

@ -186,6 +186,11 @@ bool TSystem::memoryShortage()
// to be done... // to be done...
return false; return false;
#elif defined(LINUX)
// to be done...
return false;
#else #else
@ @ @ERROR : PLATFORM NOT SUPPORTED @ @ @ERROR : PLATFORM NOT SUPPORTED

4
toonz/sources/common/ttest/ttest.cpp
View file

@ -15,6 +15,10 @@
#include <set> #include <set>
#if defined(LINUX)
#include <typeinfo>
#endif
using namespace std; using namespace std;
namespace namespace

2
toonz/sources/common/tvrender/ttessellator.cpp
View file

@ -97,7 +97,7 @@ extern "C" void CALLBACK myCombine(GLdouble coords[3], GLdouble *d[4],
typedef GLvoid(CALLBACK *GluCallback)(void); typedef GLvoid(CALLBACK *GluCallback)(void);
#endif #endif
#ifdef MACOSX #if defined(MACOSX) || defined(LINUX)
typedef GLvoid (*GluCallback)(); typedef GLvoid (*GluCallback)();

5
toonz/sources/common/twain/twain.h
View file

@ -97,6 +97,11 @@
* Platform Dependent Definitions and Typedefs * * Platform Dependent Definitions and Typedefs *
****************************************************************************/ ****************************************************************************/
#ifdef LINUX
#include <wchar.h>
#endif
/* Microsoft C/C++ Compiler */ /* Microsoft C/C++ Compiler */
#if defined(WIN32) || defined(WIN64) || defined(_WINDOWS) #if defined(WIN32) || defined(WIN64) || defined(_WINDOWS)
#define TWH_CMP_MSC #define TWH_CMP_MSC

4
toonz/sources/image/compatibility/tfile_io.h
View file

@ -13,6 +13,10 @@ extern "C" {
#include <stddef.h> #include <stddef.h>
#endif #endif
#ifdef LINUX
#include <wchar.h>
#endif
char *convertWCHAR2CHAR(const wchar_t *fname); char *convertWCHAR2CHAR(const wchar_t *fname);
#if defined(MACOSX) || defined(LINUX) #if defined(MACOSX) || defined(LINUX)

2
toonz/sources/image/tzl/tiio_tzl.cpp
View file

@ -21,7 +21,7 @@
#include "tconvert.h" #include "tconvert.h"
#include "trasterimage.h" #include "trasterimage.h"
#include "QByteArray.h" #include <QByteArray>
#if !defined(TNZ_LITTLE_ENDIAN) #if !defined(TNZ_LITTLE_ENDIAN)
TNZ_LITTLE_ENDIAN undefined !! TNZ_LITTLE_ENDIAN undefined !!

2
toonz/sources/include/tcg/hpp/triangulate.hpp
View file

@ -13,6 +13,8 @@
#include <GL/glu.h> #include <GL/glu.h>
#elif MACOSX #elif MACOSX
#include <GLUT/glut.h> #include <GLUT/glut.h>
#elif LINUX
#include <GL/glut.h>
#endif #endif
#ifndef TCG_GLU_CALLBACK #ifndef TCG_GLU_CALLBACK

4
toonz/sources/include/tcontenthistory.h
View file

@ -5,8 +5,8 @@
#include "tcommon.h" #include "tcommon.h"
#include "tfilepath.h" #include "tfilepath.h"
#include <qstring> #include <QString>
#include <qdatetime> #include <QDateTime>
#include <map> #include <map>
#include <set> #include <set>

2
toonz/sources/include/tconvert.h
View file

@ -73,7 +73,7 @@ DVAPI wstring toUpper(wstring a);
DVAPI wstring toLower(wstring a); DVAPI wstring toLower(wstring a);
#ifndef TNZCORE_LIGHT #ifndef TNZCORE_LIGHT
#include <qstring> #include <QString>
inline bool fromStr(int &v, QString s) inline bool fromStr(int &v, QString s)
{ {

2
toonz/sources/include/tfarmtask.h
View file

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include <qdatetime> #include <QDateTime>
#include "tpersist.h" #include "tpersist.h"
#include "tfarmplatforms.h" #include "tfarmplatforms.h"
#include "tfilepath.h" #include "tfilepath.h"

2
toonz/sources/include/tmsgcore.h
View file

@ -2,7 +2,7 @@
#pragma once #pragma once
#include <qobject> #include <QObject>
#include <set> #include <set>
#include "tcommon.h" #include "tcommon.h"

2
toonz/sources/include/tnztypes.h
View file

@ -18,7 +18,7 @@ typedef uint32_t TUINT32;
typedef int64_t TINT64; typedef int64_t TINT64;
typedef uint64_t TUINT64; typedef uint64_t TUINT64;
#elif defined(__LP64__) #elif defined(__LP64__) && (!defined(LINUX))
#define TINT32 \ #define TINT32 \
; \ ; \

2
toonz/sources/include/toonz/scriptbinding_files.h
View file

@ -6,7 +6,7 @@
#include "toonz/scriptbinding.h" #include "toonz/scriptbinding.h"
#include "tfilepath.h" #include "tfilepath.h"
#include <qdatetime.h> #include <QDateTime>
namespace TScriptBinding namespace TScriptBinding
{ {

2
toonz/sources/include/toonz/ttileset.h
View file

@ -4,7 +4,7 @@
#define TTILESET_HEADER #define TTILESET_HEADER
#include "trastercm.h" #include "trastercm.h"
#include <qstring> #include <QString>
#undef DVAPI #undef DVAPI
#undef DVVAR #undef DVVAR

2
toonz/sources/include/toonzqt/schematicgroupeditor.h
View file

@ -4,7 +4,7 @@
#define SCHEMATICGROUPEDITOR_H #define SCHEMATICGROUPEDITOR_H
#include "tcommon.h" #include "tcommon.h"
#include <QGraphicsItem.h> #include <QGraphicsItem>
#include "tgeometry.h" #include "tgeometry.h"
#undef DVAPI #undef DVAPI

2
toonz/sources/include/tpixel.h
View file

@ -154,6 +154,8 @@ public:
Channel b, g, r, m; Channel b, g, r, m;
#elif TNZ_MACHINE_CHANNEL_ORDER_MRGB #elif TNZ_MACHINE_CHANNEL_ORDER_MRGB
Channel m, r, g, b; Channel m, r, g, b;
#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM
Channel r, g, b, m;
#else #else
undefined machine order !!!! undefined machine order !!!!
#endif #endif

2
toonz/sources/include/tscanner.h
View file

@ -9,7 +9,7 @@
#include "trasterimage.h" #include "trasterimage.h"
#include <set> #include <set>
#include <qstring> #include <QString>
#undef DVAPI #undef DVAPI
#undef DVVAR #undef DVVAR
#ifdef TNZBASE_EXPORTS #ifdef TNZBASE_EXPORTS

4
toonz/sources/include/tsound_t.h
View file

@ -162,9 +162,9 @@ public:
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
//!Applies a trasformation (echo, reverb, ect) to the object and returns the transformed soundtrack //!Applies a trasformation (echo, reverb, ect) to the object and returns the transformed soundtrack
#ifdef MACOSX #if defined(MACOSX) || defined(LINUX)
TSoundTrackP apply(TSoundTransform *transform); TSoundTrackP apply(TSoundTransform *transform);
#else #else // WIN32
TSoundTrackP apply(TSoundTransform *transform) TSoundTrackP apply(TSoundTransform *transform)
{ {
assert(transform); assert(transform);

2
toonz/sources/include/tsystem.h
View file

@ -28,7 +28,7 @@
#ifndef TNZCORE_LIGHT #ifndef TNZCORE_LIGHT
#include <qdatetime> #include <QDateTime>
DVAPI ostream &operator<<(ostream &out, const QDateTime &t); DVAPI ostream &operator<<(ostream &out, const QDateTime &t);

2
toonz/sources/include/tthread.h
View file

@ -35,7 +35,7 @@ void DVAPI shutdown();
class ExecutorId; //Private class ExecutorId; //Private
class Runnable; class Runnable;
#ifndef MACOSX #if !(defined(MACOSX) || defined(LINUX))
template class TSmartPointerT<Runnable>; template class TSmartPointerT<Runnable>;
#endif #endif
typedef TSmartPointerT<Runnable> RunnableP; typedef TSmartPointerT<Runnable> RunnableP;

1
toonz/sources/stdfx/igs_motion_blur.cpp
View file

@ -2,6 +2,7 @@
#include <stdexcept> /* std::domain_error(-) */ #include <stdexcept> /* std::domain_error(-) */
#include <limits> /* std::numeric_limits */ #include <limits> /* std::numeric_limits */
#include <cmath> /* pow(-),abs(-) */ #include <cmath> /* pow(-),abs(-) */
#include <cstring> /* memmove */
#include "igs_ifx_common.h" /* igs::image::rgba */ #include "igs_ifx_common.h" /* igs::image::rgba */
#include "igs_motion_blur.h" #include "igs_motion_blur.h"

1
toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
View file

@ -1,4 +1,5 @@
#include <cerrno> #include <cerrno>
#include <cstring> /* memset */
#include <vector> #include <vector>
#include <stdexcept> // std::domain_error(-) #include <stdexcept> // std::domain_error(-)
#include <locale> #include <locale>

2
toonz/sources/tnzbase/tscanner/tscannerutil.cpp
View file

@ -2,6 +2,8 @@
#include "tscannerutil.h" #include "tscannerutil.h"
#include <cstring>
#define BUFBYTE(X, Y, BUF, BYTEWRAP, BITOFFS) \ #define BUFBYTE(X, Y, BUF, BYTEWRAP, BITOFFS) \
(((UCHAR *)(BUF))[(((X) + (BITOFFS)) >> 3) + (Y) * (BYTEWRAP)]) (((UCHAR *)(BUF))[(((X) + (BITOFFS)) >> 3) + (Y) * (BYTEWRAP)])

2
toonz/sources/tnzext/plasticdeformer.cpp
View file

@ -12,6 +12,8 @@
#include "ext/plasticdeformer.h" #include "ext/plasticdeformer.h"
#include <cstring>
/*! \file plasticdeformer.cpp /*! \file plasticdeformer.cpp
This file contains the implementation of a Mesh Deformer as specified in the This file contains the implementation of a Mesh Deformer as specified in the

2
toonz/sources/tnzext/plastichandle.cpp
View file

@ -18,6 +18,8 @@ using namespace tcg::bgl;
#include "ext/plastichandle.h" #include "ext/plastichandle.h"
#include <cstring>
//*********************************************************************************************** //***********************************************************************************************
// Distance building // Distance building
//*********************************************************************************************** //***********************************************************************************************

1
toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp
View file

@ -3,6 +3,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <memory> #include <memory>
#include <cstring>
//blasint may either be common 4 bytes or extended 8 (long)... //blasint may either be common 4 bytes or extended 8 (long)...
//Replace this and REBUILD the CBLAS with extended int if needed. //Replace this and REBUILD the CBLAS with extended int if needed.

2
toonz/sources/tnztools/plastictool.cpp
View file

@ -37,7 +37,7 @@
// Qt includes // Qt includes
#include <QApplication> #include <QApplication>
#include <QString> #include <QString>
#include <QToolbar> #include <QToolBar>
#include <QPushButton> #include <QPushButton>
#include <QLabel> #include <QLabel>
#include <QClipboard> #include <QClipboard>

4
toonz/sources/toonz/batches.cpp
View file

@ -24,8 +24,8 @@
#include "toonzqt/gutil.h" #include "toonzqt/gutil.h"
#include <qstring> #include <QString>
#include <qprocess> #include <QProcess>
#include <QHostInfo> #include <QHostInfo>
namespace namespace

4
toonz/sources/toonz/batches.h
View file

@ -3,11 +3,11 @@
#ifndef BATCHES_H #ifndef BATCHES_H
#define BATCHES_H #define BATCHES_H
#include <qobject> #include <QObject>
#include <map> #include <map>
#include <set> #include <set>
#include <vector> #include <vector>
#include <qstring> #include <QString>
#include "tfarmtask.h" #include "tfarmtask.h"
#include "tfilepath.h" #include "tfilepath.h"
#include "tthread.h" #include "tthread.h"

2
toonz/sources/toonz/filmstripcommand.cpp
View file

@ -16,7 +16,7 @@
#include "drawingdata.h" #include "drawingdata.h"
#include "toonzqt/strokesdata.h" #include "toonzqt/strokesdata.h"
#include "toonzqt/rasterimagedata.h" #include "toonzqt/rasterimagedata.h"
#include "timageCache.h" #include "timagecache.h"
#include "tools/toolutils.h" #include "tools/toolutils.h"
#include "toonzqt/icongenerator.h" #include "toonzqt/icongenerator.h"

2
toonz/sources/toonz/history.h
View file

@ -7,7 +7,7 @@
#include "tsystem.h" #include "tsystem.h"
#include <set> #include <set>
#include <qdatetime> #include <QDateTime>
class History class History
{ // singleton { // singleton

2
toonz/sources/toonz/insertfxpopup.h
View file

@ -4,7 +4,7 @@
#define INSERTFXPOPUP_H #define INSERTFXPOPUP_H
#include "toonzqt/dvdialog.h" #include "toonzqt/dvdialog.h"
#include "tfilePath.h" #include "tfilepath.h"
#include "tstream.h" #include "tstream.h"
// forward declaration // forward declaration

2
toonz/sources/toonz/matchline.cpp
View file

@ -15,7 +15,7 @@
// TnzLib includes // TnzLib includes
#include "toonz/txsheet.h" #include "toonz/txsheet.h"
#include "toonz/toonzscene.h" #include "toonz/toonzscene.h"
#include "toonz/levelSet.h" #include "toonz/levelset.h"
#include "toonz/txshsimplelevel.h" #include "toonz/txshsimplelevel.h"
#include "toonz/txshlevelcolumn.h" #include "toonz/txshlevelcolumn.h"
#include "toonz/txshcell.h" #include "toonz/txshcell.h"

2
toonz/sources/toonz/mergecmapped.cpp
View file

@ -4,7 +4,7 @@
#include "tpalette.h" #include "tpalette.h"
#include "toonz/txsheet.h" #include "toonz/txsheet.h"
#include "toonz/toonzscene.h" #include "toonz/toonzscene.h"
#include "toonz/levelSet.h" #include "toonz/levelset.h"
#include "toonz/txshsimplelevel.h" #include "toonz/txshsimplelevel.h"
#include "toonz/txshlevelcolumn.h" #include "toonz/txshlevelcolumn.h"
#include "toonz/txshcell.h" #include "toonz/txshcell.h"

2
toonz/sources/toonz/mergecolumns.cpp
View file

@ -4,7 +4,7 @@
#include "tpalette.h" #include "tpalette.h"
#include "toonz/txsheet.h" #include "toonz/txsheet.h"
#include "toonz/toonzscene.h" #include "toonz/toonzscene.h"
#include "toonz/levelSet.h" #include "toonz/levelset.h"
#include "toonz/txshsimplelevel.h" #include "toonz/txshsimplelevel.h"
#include "toonz/txshlevelcolumn.h" #include "toonz/txshlevelcolumn.h"
#include "toonz/txshcell.h" #include "toonz/txshcell.h"

2
toonz/sources/toonz/scenesettingspopup.cpp
View file

@ -30,7 +30,7 @@
#include <QComboBox> #include <QComboBox>
#include <QLabel> #include <QLabel>
#include <QApplication> #include <QApplication>
#include <QMainwindow> #include <QMainWindow>
#include <QPainter> #include <QPainter>
using namespace DVGui; using namespace DVGui;

2
toonz/sources/toonz/viewerdraw.cpp
View file

@ -7,7 +7,7 @@
#include "toonz/tframehandle.h" #include "toonz/tframehandle.h"
#include "toonz/tcolumnhandle.h" #include "toonz/tcolumnhandle.h"
#include "toonz/tobjecthandle.h" #include "toonz/tobjecthandle.h"
#include "toonz/cleanupParameters.h" #include "toonz/cleanupparameters.h"
#include "sceneviewer.h" #include "sceneviewer.h"
#include "ruler.h" #include "ruler.h"

2
toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
View file

@ -17,7 +17,7 @@
#include <QSettings> #include <QSettings>
// MACOSX includes // MACOSX includes
#ifdef MACOSX #if defined(MACOSX) || defined(LINUX)
#include <netdb.h> // gethostbyname #include <netdb.h> // gethostbyname
#include <arpa/inet.h> // inet_ntoa #include <arpa/inet.h> // inet_ntoa
#endif #endif

10
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
View file

@ -49,6 +49,10 @@ using namespace std;
#include <sys/sysctl.h> //To retrieve MAC HW infos #include <sys/sysctl.h> //To retrieve MAC HW infos
#endif #endif
#ifdef LINUX
#include <sys/sysctl.h>
#endif
// forward declaration // forward declaration
class FarmServer; class FarmServer;
@ -693,6 +697,7 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo)
hwInfo.m_type = Irix; hwInfo.m_type = Irix;
#else #else
#ifdef MACOSX
int mib[2]; int mib[2];
TINT64 physMemSize; TINT64 physMemSize;
size_t len; size_t len;
@ -701,6 +706,11 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo)
mib[1] = HW_MEMSIZE; mib[1] = HW_MEMSIZE;
len = sizeof(physMemSize); len = sizeof(physMemSize);
sysctl(mib, 2, &physMemSize, &len, NULL, 0); sysctl(mib, 2, &physMemSize, &len, NULL, 0);
#endif
#ifdef LINUX
TINT64 physMemSize = (TINT64)sysconf(_SC_PHYS_PAGES) * (TINT64)sysconf(_SC_PAGE_SIZE);
#endif
hwInfo.m_cpuCount = TSystem::getProcessorCount(); hwInfo.m_cpuCount = TSystem::getProcessorCount();

2
toonz/sources/toonzlib/autopos.cpp
View file

@ -14,7 +14,7 @@ fare resize e realloc size dello stack a 65000 unita'
*/ */
#ifdef MACOSX #if defined(MACOSX) || defined(LINUX)
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
#endif #endif

2
toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp
View file

@ -8,7 +8,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <search.h> #include <search.h>
#include "YombInputParam.h" #include "YOMBInputParam.h"
//#include "tmsg.h" //#include "tmsg.h"
#ifdef WIN32 #ifdef WIN32
#pragma warning(disable : 4996) #pragma warning(disable : 4996)

2
toonz/sources/toonzlib/sandor_fxs/YOMBParam.cpp
View file

@ -14,7 +14,7 @@
#include <string.h> #include <string.h>
#include "YOMBParam.h" #include "YOMBParam.h"
#include "InputParam.h" #include "InputParam.h"
#include "YombInputParam.h" #include "YOMBInputParam.h"
#include "STColSelPic.h" #include "STColSelPic.h"
#include "BlurMatrix.h" #include "BlurMatrix.h"
#include "SDef.h" #include "SDef.h"

2
toonz/sources/toonzlib/sandor_fxs/YOMBParam.h
View file

@ -15,7 +15,7 @@
#include "STColSelPic.h" #include "STColSelPic.h"
#include "SDef.h" #include "SDef.h"
#include "InputParam.h" #include "InputParam.h"
#include "YombInputParam.h" #include "YOMBInputParam.h"
#include "BlurMatrix.h" #include "BlurMatrix.h"
//#pragma warning(disable: 4786) //#pragma warning(disable: 4786)
//#include "tmsg.h" //#include "tmsg.h"

2
toonz/sources/toonzlib/studiopalettecmd.cpp
View file

@ -19,7 +19,7 @@
#include "toonz/sceneproperties.h" #include "toonz/sceneproperties.h"
#include "toonz/toonzfolders.h" #include "toonz/toonzfolders.h"
#include "toonz/txsheet.h" #include "toonz/txsheet.h"
#include <QApplication.h> #include <QApplication>
#include "historytypes.h" #include "historytypes.h"

2
toonz/sources/toonzlib/tlog.cpp
View file

@ -4,7 +4,7 @@
//#include "tfilepath.h" //#include "tfilepath.h"
#include "tfilepath_io.h" #include "tfilepath_io.h"
#include <qdatetime> #include <QDateTime>
#ifdef WIN32 #ifdef WIN32
#pragma warning(disable : 4996) #pragma warning(disable : 4996)

2
toonz/sources/toonzlib/trastercentroid.cpp
View file

@ -15,7 +15,7 @@
#include "tmsg.h" #include "tmsg.h"
#include "copP.h"*/ #include "copP.h"*/
#ifdef MACOSX #if defined(MACOSX) || defined(LINUX)
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
#endif #endif

4
toonz/sources/toonzqt/functionviewer.cpp
View file

@ -18,7 +18,7 @@
#include "toonz/txsheethandle.h" #include "toonz/txsheethandle.h"
#include "toonz/tobjecthandle.h" #include "toonz/tobjecthandle.h"
#include "toonz/tfxhandle.h" #include "toonz/tfxhandle.h"
#include "toonz/tcolumnHandle.h" #include "toonz/tcolumnhandle.h"
#include "toonz/fxdag.h" #include "toonz/fxdag.h"
#include "toonz/txshzeraryfxcolumn.h" #include "toonz/txshzeraryfxcolumn.h"
#include "toonz/tcolumnfx.h" #include "toonz/tcolumnfx.h"
@ -42,7 +42,7 @@
#include <QPushButton> #include <QPushButton>
#include <QStackedWidget> #include <QStackedWidget>
#include <QLabel> #include <QLabel>
#include <QToolbar> #include <QToolBar>
#include <QAction> #include <QAction>
using namespace DVGui; using namespace DVGui;

2
toonz/sources/toonzqt/schematicviewer.cpp
View file

@ -31,7 +31,7 @@
// Qt includes // Qt includes
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include <QMouseEvent> #include <QMouseEvent>
#include <QGraphicsItem.h> #include <QGraphicsItem>
#include <QToolBar> #include <QToolBar>
#include <QToolButton> #include <QToolButton>
#include <QMenu> #include <QMenu>

2
toonz/sources/toonzqt/spreadsheetviewer.cpp
View file

@ -8,7 +8,7 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QWheelEvent> #include <QWheelEvent>
#include <QLabel> #include <QLabel>
#include <QScrollbar> #include <QScrollBar>
#include <QPainter> #include <QPainter>
#include <QGridLayout> #include <QGridLayout>
#include <QPaintEvent> #include <QPaintEvent>