From 5b7b9fb309bc7fcf0a1dc17599c016637ef0e1d7 Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Jun 06 2017 12:19:00 +0000 Subject: V1.1.3 (#1255) --- diff --git a/toonz/sources/include/tdoubleparam.h b/toonz/sources/include/tdoubleparam.h index 70a637e..183c02b 100644 --- a/toonz/sources/include/tdoubleparam.h +++ b/toonz/sources/include/tdoubleparam.h @@ -156,8 +156,7 @@ public: std::string getValueAlias(double frame, int precision) override; }; -DVAPI void splitSpeedInOutSegment(TDoubleKeyframe &k, - TDoubleKeyframe &k0, +DVAPI void splitSpeedInOutSegment(TDoubleKeyframe &k, TDoubleKeyframe &k0, TDoubleKeyframe &k1); //--------------------------------------------------------- diff --git a/toonz/sources/include/tpersist.h b/toonz/sources/include/tpersist.h index 769c31c..c5b15b8 100644 --- a/toonz/sources/include/tpersist.h +++ b/toonz/sources/include/tpersist.h @@ -142,9 +142,10 @@ public: class TPersistDeclarationT */ #define PERSIST_DECLARATION(T) \ + \ private: \ static TPersistDeclarationT m_declaration; \ - \ + \ public: \ const TPersistDeclaration *getDeclaration() const override { \ return &m_declaration; \ diff --git a/toonz/sources/include/tpixelutils.h b/toonz/sources/include/tpixelutils.h index b57036b..04c2c2a 100644 --- a/toonz/sources/include/tpixelutils.h +++ b/toonz/sources/include/tpixelutils.h @@ -230,8 +230,7 @@ inline TPixel32 quickOverPix(const TPixel32 &bot, const TPixel32 &top) { //----------------------------------------------------------------------------- -inline TPixel32 quickOverPixPremult(const TPixel32 &bot, - const TPixel32 &top) { +inline TPixel32 quickOverPixPremult(const TPixel32 &bot, const TPixel32 &top) { return quickOverPixPremultT(bot, top); } diff --git a/toonz/sources/include/traster.h b/toonz/sources/include/traster.h index 13ce6b7..4fca77f 100644 --- a/toonz/sources/include/traster.h +++ b/toonz/sources/include/traster.h @@ -62,7 +62,6 @@ class TRasterPT; class TRaster; typedef TSmartPointerT TRasterP; - //------------------------------------------------------------ // diff --git a/toonz/sources/include/trenderresourcemanager.h b/toonz/sources/include/trenderresourcemanager.h index cbb6da7..559274a 100644 --- a/toonz/sources/include/trenderresourcemanager.h +++ b/toonz/sources/include/trenderresourcemanager.h @@ -132,10 +132,11 @@ static TRenderResourceManagerGenerator* gen(); */ #define T_RENDER_RESOURCE_MANAGER \ + \ public: \ static TRenderResourceManagerGenerator *gen(); \ static TRenderResourceManagerGenerator *deps(); \ - \ + \ private: //-------------------------------------------------------------------------------- diff --git a/toonz/sources/include/trop_borders.h b/toonz/sources/include/trop_borders.h index 2d15eeb..de601f2 100644 --- a/toonz/sources/include/trop_borders.h +++ b/toonz/sources/include/trop_borders.h @@ -165,7 +165,6 @@ class ImageMesh final : public TSmartObject, public tcg::Mesh {}; //-------------------------------------------------------------------------------- - } } // namespace TRop::borders @@ -267,7 +266,6 @@ void readMeshes(const TRasterPT &raster, ImageMeshesReaderT &reader); //-------------------------------------------------------------------------------- - } } // namespace TRop::borders diff --git a/toonz/sources/include/tsmartpointer.h b/toonz/sources/include/tsmartpointer.h index 750cc10..1f68dc7 100644 --- a/toonz/sources/include/tsmartpointer.h +++ b/toonz/sources/include/tsmartpointer.h @@ -87,9 +87,10 @@ private: }; #define DECLARE_CLASS_CODE \ + \ private: \ static const TSmartObject::ClassCode m_classCode; \ - \ + \ public: \ inline static TINT32 getInstanceCount() { \ return TSmartObject::getInstanceCount(m_classCode); \ diff --git a/toonz/sources/include/tsound_t.h b/toonz/sources/include/tsound_t.h index 466ffb2..2cd567e 100644 --- a/toonz/sources/include/tsound_t.h +++ b/toonz/sources/include/tsound_t.h @@ -133,10 +133,10 @@ from which it's created.It hasn't reference to the object. *dstSample++ = *srcSample++; } -//---------------------------------------------------------------------------- + //---------------------------------------------------------------------------- -//! 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 TSoundTrackP apply(TSoundTransform *transform) override; //---------------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_win.h b/toonz/sources/stdfx/igs_resource_msg_from_err_win.h index fc18994..6f20f27 100644 --- a/toonz/sources/stdfx/igs_resource_msg_from_err_win.h +++ b/toonz/sources/stdfx/igs_resource_msg_from_err_win.h @@ -61,29 +61,29 @@ const std::string msg_from_err_(/* 直によんではいけない */ } /*--- ::GetLastError()値からエラーメッセージを得る ---*/ #ifdef _MSC_VER - #define igs_resource_msg_from_err(tit, error_message_id) \ - igs::resource::msg_from_err_( \ - tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \ - TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \ - TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__)) - /*--- エラーメッセージを得る ---*/ - #define igs_resource_msg_from_er(tit) \ - igs::resource::msg_from_err_( \ - tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \ - TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \ - TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__)) +#define igs_resource_msg_from_err(tit, error_message_id) \ + igs::resource::msg_from_err_( \ + tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \ + TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \ + TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__)) +/*--- エラーメッセージを得る ---*/ +#define igs_resource_msg_from_er(tit) \ + igs::resource::msg_from_err_( \ + tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \ + TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \ + TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__)) #else - #define igs_resource_msg_from_err(tit, error_message_id) \ - igs::resource::msg_from_err_( \ - tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \ - TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), \ - TEXT(__VERSION__), TEXT(__DATE__), TEXT(__TIME__)) - /*--- エラーメッセージを得る ---*/ - #define igs_resource_msg_from_er(tit) \ - igs::resource::msg_from_err_( \ - tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \ - TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), \ - TEXT(__VERSION__), TEXT(__DATE__), TEXT(__TIME__)) +#define igs_resource_msg_from_err(tit, error_message_id) \ + igs::resource::msg_from_err_( \ + tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \ + TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), TEXT(__VERSION__), \ + TEXT(__DATE__), TEXT(__TIME__)) +/*--- エラーメッセージを得る ---*/ +#define igs_resource_msg_from_er(tit) \ + igs::resource::msg_from_err_( \ + tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \ + TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), TEXT(__VERSION__), \ + TEXT(__DATE__), TEXT(__TIME__)) #endif #endif /* !igs_resource_msg_from_err_h */ diff --git a/toonz/sources/stdfx/stdfx.h b/toonz/sources/stdfx/stdfx.h index d32644d..bd0cb0a 100644 --- a/toonz/sources/stdfx/stdfx.h +++ b/toonz/sources/stdfx/stdfx.h @@ -15,6 +15,7 @@ class PaletteFilterFxRenderData; static const std::string PLUGIN_PREFIX("STD"); #define FX_PLUGIN_DECLARATION(T) \ + \ public: \ const TPersistDeclaration *getDeclaration() const override; diff --git a/toonz/sources/tnztools/screenpicker.cpp b/toonz/sources/tnztools/screenpicker.cpp index 50b6a2f..1f3a679 100644 --- a/toonz/sources/tnztools/screenpicker.cpp +++ b/toonz/sources/tnztools/screenpicker.cpp @@ -64,7 +64,7 @@ void ScreenPicker::mousePressEvent(QWidget *widget, QMouseEvent *me) { void ScreenPicker::mouseMoveEvent(QWidget *widget, QMouseEvent *me) { // On fast movements, the mouse release can fire before the mouse movement - //assert(m_mouseGrabbed); - can cause a crash + // assert(m_mouseGrabbed); - can cause a crash if (!m_mousePressed || !m_mouseGrabbed) return; QPoint pos(widget->mapToGlobal(me->pos())); diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index 8fa8452..347408c 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -92,7 +92,7 @@ const char *systemVarPrefix = "LINETEST"; #else const char *applicationName = "OpenToonz"; const char *applicationVersion = "1.1"; -const char *applicationRevision = "2"; +const char *applicationRevision = "3"; const char *dllRelativePath = "./toonz6.app/Contents/Frameworks"; #endif @@ -105,7 +105,7 @@ TEnv::IntVar EnvSoftwareCurrentFontSize("SoftwareCurrentFontSize", 12); TEnv::StringVar EnvSoftwareCurrentFontWeight("SoftwareCurrentFontWeightIsBold", "Yes"); -const char *applicationFullName = "OpenToonz 1.1.2"; +const char *applicationFullName = "OpenToonz 1.1.3"; const char *rootVarName = "TOONZROOT"; const char *systemVarPrefix = "TOONZ"; @@ -396,8 +396,8 @@ int main(int argc, char *argv[]) { fmt.setStencil(true); QGLFormat::setDefaultFormat(fmt); - // seems this function should be called at all systems - // pheraps in some GLUT-implementations initalization is mere formality +// seems this function should be called at all systems +// pheraps in some GLUT-implementations initalization is mere formality #if defined(LINUX) || (defined(_WIN32) && defined(__GNUC__)) glutInit(&argc, argv); #endif diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 0896bbf..c93ebc8 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -2272,9 +2272,9 @@ RecentFiles::~RecentFiles() {} void RecentFiles::addFilePath(QString path, FileType fileType) { QList files = - (fileType == Scene) ? m_recentScenes : (fileType == Level) - ? m_recentLevels - : m_recentFlipbookImages; + (fileType == Scene) + ? m_recentScenes + : (fileType == Level) ? m_recentLevels : m_recentFlipbookImages; int i; for (i = 0; i < files.size(); i++) if (files.at(i) == path) files.removeAt(i); @@ -2399,9 +2399,9 @@ void RecentFiles::saveRecentFiles() { QList RecentFiles::getFilesNameList(FileType fileType) { QList files = - (fileType == Scene) ? m_recentScenes : (fileType == Level) - ? m_recentLevels - : m_recentFlipbookImages; + (fileType == Scene) + ? m_recentScenes + : (fileType == Level) ? m_recentLevels : m_recentFlipbookImages; QList names; int i; for (i = 0; i < files.size(); i++) { @@ -2428,9 +2428,9 @@ void RecentFiles::refreshRecentFilesMenu(FileType fileType) { menu->setEnabled(false); else { CommandId clearActionId = - (fileType == Scene) ? MI_ClearRecentScene : (fileType == Level) - ? MI_ClearRecentLevel - : MI_ClearRecentImage; + (fileType == Scene) + ? MI_ClearRecentScene + : (fileType == Level) ? MI_ClearRecentLevel : MI_ClearRecentImage; menu->setActions(names); menu->addSeparator(); QAction *clearAction = CommandManager::instance()->getAction(clearActionId); diff --git a/toonz/sources/toonzqt/keyframenavigator.cpp b/toonz/sources/toonzqt/keyframenavigator.cpp index 708f0de..278295a 100644 --- a/toonz/sources/toonzqt/keyframenavigator.cpp +++ b/toonz/sources/toonzqt/keyframenavigator.cpp @@ -42,14 +42,16 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, TFrameHandle *frameHandle) setObjectName("keyFrameNavigator"); - QPixmap emptyPrevPixmap(23, 23); // set transparent icon to show button's background + QPixmap emptyPrevPixmap( + 23, 23); // set transparent icon to show button's background emptyPrevPixmap.fill(Qt::transparent); QIcon emptyPrevIcon(emptyPrevPixmap); m_actPreviewKey = new QAction(emptyPrevIcon, tr("Previous Key"), this); connect(m_actPreviewKey, SIGNAL(triggered()), SLOT(togglePrevKeyAct())); addAction(m_actPreviewKey); - QWidget* prevWidget = widgetForAction(m_actPreviewKey); // obtain a widget generated from QAction + QWidget *prevWidget = widgetForAction( + m_actPreviewKey); // obtain a widget generated from QAction prevWidget->setObjectName("PreviousKey"); m_actKeyNo = new QAction(createQIconPNG("key_no"), tr("Set Key"), this); @@ -65,14 +67,16 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, TFrameHandle *frameHandle) connect(m_actKeyTotal, SIGNAL(triggered()), SLOT(toggleKeyAct())); addAction(m_actKeyTotal); - QPixmap emptyNextPixmap(23, 23); // set transparent icon to show button's background + QPixmap emptyNextPixmap( + 23, 23); // set transparent icon to show button's background emptyNextPixmap.fill(Qt::transparent); QIcon emptyNextIcon(emptyNextPixmap); m_actNextKey = new QAction(emptyNextIcon, tr("Next Key"), this); connect(m_actNextKey, SIGNAL(triggered()), SLOT(toggleNextKeyAct())); addAction(m_actNextKey); - QWidget* nextWidget = widgetForAction(m_actNextKey); // obtain a widget generated from QAction + QWidget *nextWidget = + widgetForAction(m_actNextKey); // obtain a widget generated from QAction nextWidget->setObjectName("NextKey"); }