diff --git a/doc/how_to_build_linux.md b/doc/how_to_build_linux.md index 00c3d34..f02cd37 100644 --- a/doc/how_to_build_linux.md +++ b/doc/how_to_build_linux.md @@ -105,7 +105,7 @@ Until then we just follow the Win32/OSX layout. The `~/.config/OpenToonz/` directory contains your settings, work and other files. -Initialize this path with the folling commands: +Initialize this path with the following commands: ``` $ mkdir -p $HOME/.config/OpenToonz diff --git a/plugins/geom/geom.cpp b/plugins/geom/geom.cpp index 303ba67..5943a1c 100644 --- a/plugins/geom/geom.cpp +++ b/plugins/geom/geom.cpp @@ -204,7 +204,7 @@ int node_destroy(toonz::node_handle_t node) int can_handle(toonz_node_handle_t node, const toonz_rendering_setting_t *rs, double frame) { printf("%s:\n", __FUNCTION__); - /* geometric plugin のように Bounding Box が自明の場合、 Skew などの変換の影響でフルスクリーン効果のような大きな Bouding Box が + /* geometric plugin のように Bounding Box が自明の場合、 Skew などの変換の影響でフルスクリーン効果のような大きな Bounding Box が 過剰に大きくなってしまうことがある. これを防ぐには非ゼロを返すこと. */ return 1; /* non zero is 'true' */ diff --git a/plugins/multiplugin/multi.cpp b/plugins/multiplugin/multi.cpp index 32a67eb..edacaad 100644 --- a/plugins/multiplugin/multi.cpp +++ b/plugins/multiplugin/multi.cpp @@ -200,7 +200,7 @@ int node_destroy(toonz::node_handle_t node) int can_handle(toonz_node_handle_t node, const toonz_rendering_setting_t *rs, double frame) { printf("%s:\n", __FUNCTION__); - /* geometric plugin のように Bounding Box が自明の場合、 Skew などの変換の影響でフルスクリーン効果のような大きな Bouding Box が + /* geometric plugin のように Bounding Box が自明の場合、 Skew などの変換の影響でフルスクリーン効果のような大きな Bounding Box が 過剰に大きくなってしまうことがある. これを防ぐには非ゼロを返すこと. */ return 1; /* non zero is 'true' */ diff --git a/stuff/doc/TileIwa.html b/stuff/doc/TileIwa.html index 2ae98a2..f8ae7a6 100644 --- a/stuff/doc/TileIwa.html +++ b/stuff/doc/TileIwa.html @@ -32,7 +32,7 @@ be placed outside the camera.
  • Left Quantity : Specify the number of repetitions to the left.
    "No Tile"  It will not repeat the tiles.
    "1 Tile"   It will repeat the image only 1 time.
    -"Mutiple Tiles" It will repeat the image indefinitely within the specified range. +"Multiple Tiles" It will repeat the image indefinitely within the specified range.
  • Right Quantity : Specify the number of repetitions to the right. (See Left Quantity).
  • Mirror Horizontally : When active, tiles arranged in the horizontal direction will be flipped
    diff --git a/stuff/doc/español/TileIwa.html b/stuff/doc/español/TileIwa.html index 661fbfd..ce8aded 100644 --- a/stuff/doc/español/TileIwa.html +++ b/stuff/doc/español/TileIwa.html @@ -33,7 +33,7 @@ En otras palabras, las repeticiones se ubicarán por fuera del encuadre de la c�
  • Left Quantity (Cantidad izquierda) : La cantidad de repeticiones hacia la izquierda.
    "No Tile" (No repetir)  No habrá repeticiones en esta dirección.
    "1 Tile" (1 repetición)   Repetirá la imagen una sola vez en esta dirección.
    -"Mutiple Tiles" (Múltiples repeticiones) Repetirá la imagen indefinidamente en esta dirección. +"Multiple Tiles" (Múltiples repeticiones) Repetirá la imagen indefinidamente en esta dirección.
  • Right Quantity (Cantidad derecha) : La cantidad de repeticiones hacia la derecha. (ver Left Quantity).
  • Mirror Horizontally (Espejar horizontalmente) : Al estar activada, las repeticiones en esta dirección
    diff --git a/stuff/doc/日本語/TileIwa.html b/stuff/doc/日本語/TileIwa.html index c69814e..360fb5a 100644 --- a/stuff/doc/日本語/TileIwa.html +++ b/stuff/doc/日本語/TileIwa.html @@ -29,7 +29,7 @@ Toonz既存の「TileFx」の機能を以下の点で強化したものです。
  • Left Quantity : 左側に繰り返す回数を指定します。
    "No Tile"  繰り返しません。
    "1 Tile"   1枚だけ繰り返します。
    -"Mutiple Tiles" 必要な範囲内で無限に繰り返します。 +"Multiple Tiles" 必要な範囲内で無限に繰り返します。
  • Right Quantity : 右側に繰り返す回数を指定します。（Left Quantityを参照）
  • Mirror Horizontally : ONのとき、水平方向に並ぶタイルが、1枚おきに左右反転されるようになります。
    • diff --git a/stuff/library/mypaint brushes/deevad/readme.txt b/stuff/library/mypaint brushes/deevad/readme.txt index ca68ce3..9f99c27 100644 --- a/stuff/library/mypaint brushes/deevad/readme.txt +++ b/stuff/library/mypaint brushes/deevad/readme.txt @@ -8,7 +8,7 @@ what you want with it. If you accept this license, a new brush group named 'deevad-v6' will be created. More infos on the brushes on my blog, or my deviant-art -account , under the ressources category. +account , under the resources category. Released in end october 2012 diff --git a/stuff/library/shaders/readme.txt b/stuff/library/shaders/readme.txt index ba3b1ea..09c8222 100644 --- a/stuff/library/shaders/readme.txt +++ b/stuff/library/shaders/readme.txt @@ -254,7 +254,7 @@ and more. Fx writers may want to explicitly specify a parameter concept for the following reasons: - a. Impose a measure to the parameter (e.g. degress, inches, %) + a. Impose a measure to the parameter (e.g. degrees, inches, %) b. Make the parameter editable in camera-stand @@ -265,7 +265,7 @@ The complete list of supported parameter concepts is the following: length - Displayed in length units (inches, mm, cm, etc..) - angle - Displayed in angular units '�' + angle - Displayed in angular units '�' point - A vec2 displayed in length units diff --git a/toonz/sources/common/tapptools/tcolorutils.cpp b/toonz/sources/common/tapptools/tcolorutils.cpp index daaddb8..bc0ac37 100644 --- a/toonz/sources/common/tapptools/tcolorutils.cpp +++ b/toonz/sources/common/tapptools/tcolorutils.cpp @@ -1103,7 +1103,7 @@ void TColorUtils::buildColorChipPalette(QList> &palette, edgePoints.at(corners[EdgePoint::LeftLower]).pos); if (chip.validate(raster, step)) colorChips.append(chip); - // remove the coner information from the corner point + // remove the corner information from the corner point QMap::const_iterator i = corners.constBegin(); while (i != corners.constEnd()) { edgePoints[i.value()].info &= ~i.key(); diff --git a/toonz/sources/common/tapptools/tenv.cpp b/toonz/sources/common/tapptools/tenv.cpp index ff22999..13de2a2 100644 --- a/toonz/sources/common/tapptools/tenv.cpp +++ b/toonz/sources/common/tapptools/tenv.cpp @@ -322,7 +322,7 @@ public: //========================================================= // -// varaible manager (singleton) +// variable manager (singleton) // //========================================================= diff --git a/toonz/sources/common/tcache/timagecache.cpp b/toonz/sources/common/tcache/timagecache.cpp index 2513700..9320a52 100644 --- a/toonz/sources/common/tcache/timagecache.cpp +++ b/toonz/sources/common/tcache/timagecache.cpp @@ -824,7 +824,7 @@ void TImageCache::Imp::doCompress() { assert(uitem); item->m_cantCompress = true; CacheItemP newItem = new CompressedOnMemoryCacheItem( - item->getImage()); // WARNING the codec buffer allocation can CHANGE + item->getImage()); // WARNING the codec buffer allocation can CHANGE // the cache. item->m_cantCompress = false; if (newItem->getSize() == @@ -838,7 +838,7 @@ void TImageCache::Imp::doCompress() { m_compressedItems[id] = newItem; item = CacheItemP(); uitem = UncompressedOnMemoryCacheItemP(); - // doCompress();//restart, since interators can have been changed (see + // doCompress();//restart, since iterators could have been changed (see // comment above) // return; itu = m_itemHistory.begin(); @@ -1921,13 +1921,13 @@ void TImageCache::Imp::outputMap(UINT chunkRequested, std::string filename) { "\n"; // os<<"***bigmem available" + // std::to_string((int)TBigMemoryManager::instance()->getAvailableMemoryinKb()); - os << "***uncompressed NOT compressable(refcount>1) " + + os << "***uncompressed NOT compressible(refcount>1) " + std::to_string(umcount1) + " " + std::to_string(umsize1 / 1024.0) + " MB\n"; - os << "***uncompressed NOT compressable(cantCompress) " + + os << "***uncompressed NOT compressible(cantCompress) " + std::to_string(umcount2) + " " + std::to_string(umsize2 / 1024.0) + " MB\n"; - os << "***uncompressed compressable " + std::to_string(umcount3) + " " + + os << "***uncompressed compressible " + std::to_string(umcount3) + " " + std::to_string(umsize3 / 1024.0) + " MB\n"; os << "***compressed on mem " + std::to_string(cmcount) + " " + std::to_string((int)cmsize / 1048576.0) + " MB\n"; diff --git a/toonz/sources/common/tcore/tthread.cpp b/toonz/sources/common/tcore/tthread.cpp index a5ff80b..55b8442 100644 --- a/toonz/sources/common/tcore/tthread.cpp +++ b/toonz/sources/common/tcore/tthread.cpp @@ -107,8 +107,8 @@ // conditions are *BLOCKING*. // Thread-safety: -// * Most of the following code is mutex-protected, altough it might seem not - -// indeed, +// * Most of the following code is mutex-protected, although it may not seem +// like it - indeed, // only *one* mutex is locked and unlocked all of the time. This 'transition // mutex' is // the key to thread-safety: we're considered to lie in a 'transition state' @@ -475,7 +475,7 @@ inline bool Runnable::customConditions() { that the application must wait for the task to be finished, print logs or similar. This signal is always preceded by a canceled() signal, informing all - active tasks that thay should begin quitting on their own in a 'soft' + active tasks that they should begin quitting on their own in a 'soft' way before brute termination may occur. \sa \b Executor::shutdown static method and \b Runnable::canceled signal. @@ -715,7 +715,7 @@ void Executor::init() { //! to terminate - this depends //! on the code connected to the terminated() signal and is under the user's //! responsibility (see the -//! remarks specified in started() signal descritpion); if this is the intent +//! remarks specified in started() signal description); if this is the intent //! and the terminated slot //! is invoked in the controller thread, you should remember to implement a //! local event loop in it (so that diff --git a/toonz/sources/common/tfx/tcacheresource.cpp b/toonz/sources/common/tfx/tcacheresource.cpp index 653f239..ae66c13 100644 --- a/toonz/sources/common/tfx/tcacheresource.cpp +++ b/toonz/sources/common/tfx/tcacheresource.cpp @@ -77,7 +77,7 @@ in case some part of the complex inside the cell has been defined. The plane outside the complex is assumed to be transparent. \n -The lattice origin must be specified in the complex's contructor, and all tiles +The lattice origin must be specified in the complex's constructor, and all tiles uploaded into and downloaded from it must have an integer displacement with respect to it - in other words, it is required that the complex has a well-defined pixel @@ -317,7 +317,7 @@ inline TPoint TCacheResource::getCellPos(const TPointD &pos) const { bool TCacheResource::checkRasterType(const TRasterP &ras, int &rasType) const { rasType = ::getRasterType(ras); if (rasType == NONE) { - assert(!"The passed raster has unkown type!"); + assert(!"The passed raster has unknown type!"); return false; } if (m_tileType != NONE && m_tileType != rasType) { diff --git a/toonz/sources/common/tfx/tfxcachemanager.cpp b/toonz/sources/common/tfx/tfxcachemanager.cpp index 1786b41..6647486 100644 --- a/toonz/sources/common/tfx/tfxcachemanager.cpp +++ b/toonz/sources/common/tfx/tfxcachemanager.cpp @@ -65,7 +65,7 @@ efficiently store Now, the principal classes dealing with this job are: - One TFxCacheManager per render instance, used to store predictive -informations. +information. - A set of TFxCacheManagerDelegate per render instance, used to store references to cache resources and providing reasons for caching results. diff --git a/toonz/sources/common/tgl/tstencilcontrol.cpp b/toonz/sources/common/tgl/tstencilcontrol.cpp index efe3bc8..784f6d1 100644 --- a/toonz/sources/common/tgl/tstencilcontrol.cpp +++ b/toonz/sources/common/tgl/tstencilcontrol.cpp @@ -34,7 +34,7 @@ public: ~StencilControlManager() {} }; -} // Local namepace +} // Local namespace //----------------------------------------------------------------------------------------- @@ -43,7 +43,7 @@ public: int m_stencilBitCount; int m_pushCount; int m_currentWriting; // current stencil bit plane. - // 0 is the first bit plane ; -1 menas no stencil mask is writing + // 0 is the first bit plane ; -1 means no stencil mask is writing int m_virtualState; // the state of the (eventually virtual) top mask. diff --git a/toonz/sources/common/tiio/bmp/filebmp.c b/toonz/sources/common/tiio/bmp/filebmp.c index 5f3e817..c300928 100644 --- a/toonz/sources/common/tiio/bmp/filebmp.c +++ b/toonz/sources/common/tiio/bmp/filebmp.c @@ -1194,8 +1194,8 @@ static int skip_rowsBMPC4(FILE *fp, UINT rows) rows = 0; break; case 0x02: - c1 = getc(fp); /* x buffer offest */ - c1 = getc(fp); /* y buffer offest */ + c1 = getc(fp); /* x buffer offset */ + c1 = getc(fp); /* y buffer offset */ rows -= c1; break; default: @@ -1473,8 +1473,8 @@ static int skip_rowsBMPC8(FILE *fp, UINT rows) rows = 0; break; case 0x02: - c1 = getc(fp); /* x buffer offest */ - c1 = getc(fp); /* y buffer offest */ + c1 = getc(fp); /* x buffer offset */ + c1 = getc(fp); /* y buffer offset */ rows -= c1; break; default: diff --git a/toonz/sources/common/tiio/tiio_jpg_exif.cpp b/toonz/sources/common/tiio/tiio_jpg_exif.cpp index 36774b8..7da7d8e 100644 --- a/toonz/sources/common/tiio/tiio_jpg_exif.cpp +++ b/toonz/sources/common/tiio/tiio_jpg_exif.cpp @@ -706,7 +706,7 @@ void JpgExifReader::ProcessExifDir(unsigned char *DirStart, if (ImageInfo.Comments[0]) { // We already have a jpeg comment. // Already have a comment (probably windows comment), skip this one. if (ShowTags) - printf("Windows XP commend and other comment in header\n"); + printf("Windows XP comment and other comment in header\n"); break; // Already have a windows comment, skip this one. } diff --git a/toonz/sources/common/traster/traster.cpp b/toonz/sources/common/traster/traster.cpp index e219a79..480f148 100644 --- a/toonz/sources/common/traster/traster.cpp +++ b/toonz/sources/common/traster/traster.cpp @@ -65,7 +65,7 @@ m_buffer = BigMemoryManager.getMemoryChunk(lx*ly*pixelSize, this); //m_buffer = new UCHAR[lx*ly*pixelSize]; m_totalMemory += ((lx*ly*pixelSize)>>10); #ifdef _WIN32 -MessageBox( NULL, "Run out of contiguos phisical memory: please save all and +MessageBox( NULL, "Run out of contiguous phisical memory: please save all and restart toonz!", "Warning", MB_OK); #endif }*/ diff --git a/toonz/sources/common/trasterimage/tcachedlevel.cpp b/toonz/sources/common/trasterimage/tcachedlevel.cpp index 0e28ead..b19d15f 100644 --- a/toonz/sources/common/trasterimage/tcachedlevel.cpp +++ b/toonz/sources/common/trasterimage/tcachedlevel.cpp @@ -1021,7 +1021,7 @@ int ZFile::read(BYTE buf[], int size, TINT64 qwOffset) const { #define DWORDLONG_LO_DWORD(dwl64) ((DWORD)(dwl64)) #define DWORDLONG_HI_DWORD(dwl64) ((DWORD)(dwl64 >> 32)) - // set the overlapped stucture with the offsets + // set the overlapped structure with the offsets overLapped.Offset = DWORDLONG_LO_DWORD(qwOffset); overLapped.OffsetHigh = DWORDLONG_HI_DWORD(qwOffset); @@ -1040,7 +1040,7 @@ int ZFile::read(BYTE buf[], int size, TINT64 qwOffset) const { (void *)buf, // buffer to store data bytesToRead, // num bytes to read &bytesRead, // bytes read - &overLapped); // stucture for file offsets + &overLapped); // structure for file offsets if (!result) { DWORD error = GetLastError(); @@ -1074,7 +1074,7 @@ int ZFile::write(BYTE buf[], int size, TINT64 qwOffset) const { char msg[2048] = ""; unsigned long bytesToWrite; // Padded number of bytes to write. - unsigned long bytesWritten = 0; // count of bytes actually writtten + unsigned long bytesWritten = 0; // count of bytes actually written int result; @@ -1082,7 +1082,7 @@ int ZFile::write(BYTE buf[], int size, TINT64 qwOffset) const { OVERLAPPED *overLapped = new OVERLAPPED; memset(overLapped, 0, sizeof(OVERLAPPED)); - // set the overlapped stucture with the offsets + // set the overlapped structure with the offsets overLapped->Offset = DWORDLONG_LO_DWORD(qwOffset); overLapped->OffsetHigh = DWORDLONG_HI_DWORD(qwOffset); overLapped->hEvent = NULL; @@ -1092,7 +1092,7 @@ int ZFile::write(BYTE buf[], int size, TINT64 qwOffset) const { result = WriteFileEx(m_fileHandle, // file handle (void *)buf, // data buffer bytesToWrite, // num bytes to write - overLapped, // stucture for file offsets + overLapped, // structure for file offsets &ZFile::FileIOCompletionRoutine); ResetEvent(m_writeNotPending); @@ -1100,7 +1100,7 @@ int ZFile::write(BYTE buf[], int size, TINT64 qwOffset) const { OVERLAPPED overLapped; memset(&overLapped, 0, sizeof(overLapped)); - // set the overlapped stucture with the offsets + // set the overlapped structure with the offsets overLapped.Offset = DWORDLONG_LO_DWORD(qwOffset); overLapped.OffsetHigh = DWORDLONG_HI_DWORD(qwOffset); overLapped.hEvent = NULL; @@ -1111,7 +1111,7 @@ int ZFile::write(BYTE buf[], int size, TINT64 qwOffset) const { (void *)buf, // data buffer bytesToWrite, // num bytes to read &bytesWritten, // bytes read - &overLapped); // stucture for file offsets + &overLapped); // structure for file offsets } if (!result) { diff --git a/toonz/sources/common/trop/borders_extractor.h b/toonz/sources/common/trop/borders_extractor.h index 87d64b5..c86d43d 100644 --- a/toonz/sources/common/trop/borders_extractor.h +++ b/toonz/sources/common/trop/borders_extractor.h @@ -29,7 +29,7 @@ namespace borders { For example, if we want to extract the borders of a fullcolor image that separate bright areas from dark ones, we can just have a pixel selector cast each pixel to the integer value 0 if the pixel's value is below the - brigthness threshold, and 1 if above. + brightness threshold, and 1 if above. \n\n Also, pixel selectors tell whether pixels are to be intended as completely transparent (virtual pixels outside the raster boundaries are). diff --git a/toonz/sources/common/trop/runsmap.h b/toonz/sources/common/trop/runsmap.h index e6e4337..4b2334e 100644 --- a/toonz/sources/common/trop/runsmap.h +++ b/toonz/sources/common/trop/runsmap.h @@ -11,10 +11,10 @@ /*! The RunsMapP is an auxiliary raster greymap type used to store run-length - informations + information about an image. - Not every image pixel has valid informations. Only pixels corresponding to + Not every image pixel has valid information. Only pixels corresponding to run headers do, and those include the position of the next run header. This means that users must always iterate from the beginning of a line to get valid diff --git a/toonz/sources/common/trop/terodilate.cpp b/toonz/sources/common/trop/terodilate.cpp index 63021d3..7e5830b 100644 --- a/toonz/sources/common/trop/terodilate.cpp +++ b/toonz/sources/common/trop/terodilate.cpp @@ -229,7 +229,7 @@ void erodilate_chan(const TRasterPT &src, const TRasterPT &dst, // perform a cache-friendly iteration in the separable/square kernel case int x, y, lx = src->getLx(), ly = src->getLy(); - // Peform rows erodilation + // Perform rows erodilation TRasterPT temp(ly, lx); // Notice transposition plz { diff --git a/toonz/sources/common/trop/tresample.cpp b/toonz/sources/common/trop/tresample.cpp index e7be26f..830aa72 100644 --- a/toonz/sources/common/trop/tresample.cpp +++ b/toonz/sources/common/trop/tresample.cpp @@ -2376,7 +2376,7 @@ void rop_resample_rgbm(TRasterPT rout, const TRasterPT &rin, // the *opposites* of fractionary parts (explained later). // NOTE: We'll assume we want to include in the filter mask all //*integer positions around a fractionary displacement of the origin*; - // so the approximations below are stricly necessary. + // so the approximations below are strictly necessary. min_pix_ref_u = intLE(min_pix_out_u_); min_pix_ref_v = intLE(min_pix_out_v_); @@ -3059,7 +3059,7 @@ void do_resample(TRasterCM32P rout, const TRasterCM32P &rin, v * wrapin; // Take the associated input pixel pointer tcm[0] = in_tcm[0]; if (u < lu - 1 && v < lv - 1) { - // Also take their 4 next neighours (we shall perform a kinf of bilinear + // Also take their 4 next neighbours (we shall perform a kinf of bilinear // interpolation) tcm[1] = in_tcm[1]; tcm[2] = in_tcm[wrapin]; diff --git a/toonz/sources/common/trop/tropcm.cpp b/toonz/sources/common/trop/tropcm.cpp index 99df266..a209f54 100644 --- a/toonz/sources/common/trop/tropcm.cpp +++ b/toonz/sources/common/trop/tropcm.cpp @@ -777,7 +777,7 @@ void expandAreaAndFillGaps(TRasterCM32P ras) { if (pix->getPaint() != TPixelCM32::getMaxPaint()) continue; int paint = TPixelCM32::getMaxPaint(); - // check the neibor pixes and take the smallest styleId + // check the neighbor pixels and take the smallest styleId if (upPix != pix && upPix->getInk() != TPixelCM32::getMaxInk()) paint = upPix->getPaint(); if (dnPix != pix && dnPix->getInk() != TPixelCM32::getMaxInk()) diff --git a/toonz/sources/common/tstream/tstream.cpp b/toonz/sources/common/tstream/tstream.cpp index f6a3cc5..c1491b0 100644 --- a/toonz/sources/common/tstream/tstream.cpp +++ b/toonz/sources/common/tstream/tstream.cpp @@ -1154,7 +1154,7 @@ TIStream &TIStream::operator>>(TPersist *&v) { //--------------------------------------------------------------- bool TIStream::matchEndTag() { - if (m_imp->m_tagStack.empty()) throw TException("tag stack emtpy"); + if (m_imp->m_tagStack.empty()) throw TException("tag stack empty"); if (!m_imp->matchTag()) return false; if (m_imp->m_currentTag.m_type != StreamTag::EndTag) return false; if (m_imp->m_currentTag.m_name != m_imp->m_tagStack.back()) diff --git a/toonz/sources/common/tsystem/tfilepath_io.cpp b/toonz/sources/common/tsystem/tfilepath_io.cpp index 45d4df9..5f00773 100644 --- a/toonz/sources/common/tsystem/tfilepath_io.cpp +++ b/toonz/sources/common/tsystem/tfilepath_io.cpp @@ -34,7 +34,7 @@ FILE *fopen(const TFilePath &fp, string mode) { Tifstream::Tifstream(const TFilePath &fp) : ifstream(m_file = fopen(fp, "rb")) { // manually set the fail bit here, since constructor ifstream::ifstream(FILE*) // does not so even if the argument is null pointer. - // the state will be refered in "TIStream::operator bool()" ( in tstream.cpp ) + // the state will be referred in "TIStream::operator bool()" ( in tstream.cpp ) if (!m_file) setstate(failbit); } @@ -54,7 +54,7 @@ Tofstream::Tofstream(const TFilePath &fp, bool append_existing) : ofstream(m_file = fopen(fp, append_existing ? "ab" : "wb")) { // manually set the fail bit here, since constructor ofstream::ofstream(FILE*) // does not so even if the argument is null pointer. - // the state will be refered in "TOStream::operator bool()" ( in tstream.cpp ) + // the state will be referred in "TOStream::operator bool()" ( in tstream.cpp ) if (!m_file) setstate(failbit); } diff --git a/toonz/sources/common/tsystem/tsystem.cpp b/toonz/sources/common/tsystem/tsystem.cpp index 0628856..bf5e3d3 100644 --- a/toonz/sources/common/tsystem/tsystem.cpp +++ b/toonz/sources/common/tsystem/tsystem.cpp @@ -540,7 +540,7 @@ void TSystem::readDirectory(TFilePathSet &groupFpSet, TFilePathSet &allFpSet, // store all file paths fileSet_all.insert(son); - // in case of the sequencial files + // in case of the sequential files if (son.getDots() == "..") son = son.withFrame(); // store the group. insersion avoids duplication of the item diff --git a/toonz/sources/common/tsystem/tsystempd.cpp b/toonz/sources/common/tsystem/tsystempd.cpp index 585fe74..2c0c1ee 100644 --- a/toonz/sources/common/tsystem/tsystempd.cpp +++ b/toonz/sources/common/tsystem/tsystempd.cpp @@ -196,7 +196,7 @@ bool TSystem::memoryShortage() { memStatus.ullTotalVirtual * 0.6; // if total memory used by this process(WorkingSetSize) is // half of max allocatable memory -//(ullTotalVirtual: on 32bits machines, tipically it's 2GB) +//(ullTotalVirtual: on 32bits machines, typically it's 2GB) // It's better "to stay large"; for values >0.6 this function may // returns that there is memory, but for fragmentation the malloc fails the // same! @@ -243,7 +243,7 @@ TINT64 TSystem::getFreeMemorySize(bool onlyPhisicalMemory) { // check for virtual memory int numberOfResources = - swapctl(SC_GETNSWP, 0); /* get number of swapping resources configued */ + swapctl(SC_GETNSWP, 0); /* get number of swapping resources configured */ if (numberOfResources == 0) return 0; diff --git a/toonz/sources/common/tvectorimage/tcomputeregions.cpp b/toonz/sources/common/tvectorimage/tcomputeregions.cpp index bf156bc..0c0acd3 100644 --- a/toonz/sources/common/tvectorimage/tcomputeregions.cpp +++ b/toonz/sources/common/tvectorimage/tcomputeregions.cpp @@ -1438,7 +1438,7 @@ static bool isCloseEnoughP2P(double facMin, double facMax, TStroke *s1, dist2 = tdistance2(p0, p1); - /*!when closing beetween a normal stroke and a 0-thickness stroke (very + /*!when closing between a normal stroke and a 0-thickness stroke (very * typical) the thin one is assumed to have same thickness of the other*/ if (p0.thick == 0) p0.thick = p1.thick; @@ -1618,7 +1618,7 @@ static bool isCloseEnoughP2L(double facMin, double facMax, TStroke *s1, TThickPoint p1 = s2->getChunk(index)->getThickPoint(t); - /*!when closing beetween a normal stroke and a 0-thickness stroke (very + /*!when closing between a normal stroke and a 0-thickness stroke (very * typical) the thin one is assumed to have same thickness of the other*/ if (p0.thick == 0) p0.thick = p1.thick; diff --git a/toonz/sources/common/tvectorimage/tstroke.cpp b/toonz/sources/common/tvectorimage/tstroke.cpp index 022cfe2..5e48e5e 100644 --- a/toonz/sources/common/tvectorimage/tstroke.cpp +++ b/toonz/sources/common/tvectorimage/tstroke.cpp @@ -1186,7 +1186,7 @@ DEFINE_CLASS_CODE(TStroke, 15) //----------------------------------------------------------------------------- -// Costructor +// Constructor TStroke::TStroke() : TSmartObject(m_classCode) { vector p(3); p[0] = TThickPoint(0, 0, 0); diff --git a/toonz/sources/common/tvectorimage/tvectorimage.cpp b/toonz/sources/common/tvectorimage/tvectorimage.cpp index 5bd6df6..748ebab 100644 --- a/toonz/sources/common/tvectorimage/tvectorimage.cpp +++ b/toonz/sources/common/tvectorimage/tvectorimage.cpp @@ -2154,10 +2154,10 @@ VIStroke *TVectorImage::Imp::joinStroke(int index1, int index2, int cpIndex1, int cpCount2 = stroke2->getControlPointCount(); int styleId = stroke1->getStyle(); - // check if the both ends are at the same postion + // check if the both ends are at the same position bool isSamePos = isAlmostZero(tdistance2(stroke1->getControlPoint(cpIndex1), stroke2->getControlPoint(cpIndex2))); - // connecting the ends in the same shape at the same postion + // connecting the ends in the same shape at the same position // means just making the shape self-looped if (isSamePos && index1 == index2) { stroke1->setSelfLoop(); diff --git a/toonz/sources/common/tvrender/tellipticbrush.cpp b/toonz/sources/common/tvrender/tellipticbrush.cpp index 9e758e1..46e23a6 100644 --- a/toonz/sources/common/tvrender/tellipticbrush.cpp +++ b/toonz/sources/common/tvrender/tellipticbrush.cpp @@ -16,7 +16,7 @@ using namespace tellipticbrush; /*! \file tellipticbrush.cpp This code deals with the "outlinization" process of a TStroke instance. -The process of extracing the outline of a thick stroke can be resumed in 2 main +The process of extracting the outline of a thick stroke can be resumed in 2 main steps: 1. Discretize the stroke centerline in the most appropriate centerline points, @@ -472,7 +472,7 @@ void CoverageLinearizator::linearize(std::vector &cPoints, TThickPoint P0(ttq.getThickP0()), P1(ttq.getThickP1()), P2(ttq.getThickP2()); if ((P0 == P1) || (P1 == P2)) - return; // Linear speed out/in case. Straighted up in the buildDirs() + return; // Linear speed out/in case. Straightened up in the buildDirs() // Remember that d = 2 [P1 - P0 + t (P0 + P2 - 2 P1)] @@ -877,7 +877,7 @@ void tellipticbrush::OutlineBuilder::addRoundSideCaps( std::vector &oPoints, const CenterlinePoint &cPoint) { // Side caps - this has only sense when the backward and forward // direction-derivatives - // are different. This means that thay build different envelope directions. + // are different. This means that they build different envelope directions. // So, we add // side caps to cover the 'elbow fractures' @@ -1132,7 +1132,7 @@ namespace { /* Quick container to store all the linearization features to be supported. - \note The set should be appropriately ordered so that linearizator dependance + \note The set should be appropriately ordered so that linearizator dependence can be supported (linearizators may work depending on knowledge of the other linearized points) */ diff --git a/toonz/sources/common/tvrender/tellipticbrushP.h b/toonz/sources/common/tvrender/tellipticbrushP.h index 74fa13c..8676f5a 100644 --- a/toonz/sources/common/tvrender/tellipticbrushP.h +++ b/toonz/sources/common/tvrender/tellipticbrushP.h @@ -65,7 +65,7 @@ struct OutlinizationData { which includes its position, and eventual forward and backward derivative-like directions. Thickness data is included in the structure. - These informations are necessary and sufficient to build associated outline + This information is necessary and sufficient to build associated outline points, and eventual additional points related to caps. */ @@ -74,7 +74,7 @@ struct CenterlinePoint { double m_t; //!< The quadratic parameter where this point can be found TThickPoint m_p; //!< The point's thick coordinates - bool m_posBuilt; //!< Wheteher m_p has been calculated + bool m_posBuilt; //!< Whether m_p has been calculated TThickPoint m_prevD; //!< The backward direction bool m_hasPrevD; //!< If the point has (envelopable) backward direction diff --git a/toonz/sources/common/tvrender/tfont_qt.cpp b/toonz/sources/common/tvrender/tfont_qt.cpp index e37d9d3..36d66bd 100644 --- a/toonz/sources/common/tvrender/tfont_qt.cpp +++ b/toonz/sources/common/tvrender/tfont_qt.cpp @@ -362,7 +362,7 @@ void TFontManager::setFamily(const wstring family) { m_pimpl->m_currentFamily = family; // XXX: if current style is not valid for family, reset it? -// doing so asserts when chosing a font in the GUI +// doing so asserts when choosing a font in the GUI #if 0 QStringList styles = m_pimpl->m_qfontdb->styles(qFamily); if (styles.contains(QString::fromStdWString(m_pimpl->m_currentTypeface))) { diff --git a/toonz/sources/common/tvrender/tpalette.cpp b/toonz/sources/common/tvrender/tpalette.cpp index a7319ad..d132804 100644 --- a/toonz/sources/common/tvrender/tpalette.cpp +++ b/toonz/sources/common/tvrender/tpalette.cpp @@ -607,7 +607,7 @@ public: } /*! -\details Explicitly ovverrides the stream's version, returning m_version. +\details Explicitly overrides the stream's version, returning m_version. This is necessary since palettes have their \a own version number, which is \a not the TIStream's file one. */ @@ -1070,7 +1070,7 @@ void TPalette::setFrame(int frame) { TColorStyle *cs = getStyle(styleId); assert(cs); - // Buid the keyframes interval containing frame + // Build the keyframes interval containing frame StyleAnimation::iterator j0, j1; j1 = animation.lower_bound( diff --git a/toonz/sources/common/tvrender/tstrokeutil.cpp b/toonz/sources/common/tvrender/tstrokeutil.cpp index 58cbe40..0851cd4 100644 --- a/toonz/sources/common/tvrender/tstrokeutil.cpp +++ b/toonz/sources/common/tvrender/tstrokeutil.cpp @@ -317,7 +317,7 @@ bool increaseControlPoints(TStroke &stroke, const TStrokeDeformation &deformer, // questa funzione trova il punto in cui si supera il valore maxdifference // if minimum is not found or is equal to previous value - // use an euristic... + // use an heuristic... if (minimum < 0 || w == minimum) { minimum = w + incr * 0.5; w += step; diff --git a/toonz/sources/common/tvrender/tvectorbrush.cpp b/toonz/sources/common/tvrender/tvectorbrush.cpp index 481f894..ad6618d 100644 --- a/toonz/sources/common/tvrender/tvectorbrush.cpp +++ b/toonz/sources/common/tvrender/tvectorbrush.cpp @@ -672,7 +672,7 @@ void RecursiveReferenceLinearizator::subdivideCenterline( /* Quick container to store all the linearization features to be supported. - \note The set should be appropriately ordered so that linearizator dependance + \note The set should be appropriately ordered so that linearizator dependence can be supported (linearizators may work depending on knowledge of the other linearized points) */ diff --git a/toonz/sources/common/twain/ttwainP.h b/toonz/sources/common/twain/ttwainP.h index 4534c6c..f58073a 100644 --- a/toonz/sources/common/twain/ttwainP.h +++ b/toonz/sources/common/twain/ttwainP.h @@ -40,10 +40,10 @@ typedef enum TWAINSTATE { struct TRANSFER_INFO { TTWAIN_TRANSFER_MECH transferMech; /*current transfer mechanism */ TTWAIN_USAGE_MODE usageMode; - /*used by buffered memory tranfer */ + /*used by buffered memory transfer */ unsigned char *memoryBuffer; unsigned long memorySize; - /*used by native tranfer */ + /*used by native transfer */ void *hDib; /*common to all the transfer mode */ int preferredLx; diff --git a/toonz/sources/image/bmp/filebmp.c b/toonz/sources/image/bmp/filebmp.c index 1f0a2fc..db95769 100644 --- a/toonz/sources/image/bmp/filebmp.c +++ b/toonz/sources/image/bmp/filebmp.c @@ -1197,8 +1197,8 @@ static int skip_rowsBMPC4(FILE *fp, UINT rows) case 0x00: rows--; CASE 0x01 : rows = 0; - CASE 0x02 : c1 = getc(fp); /* x buffer offest */ - c1 = getc(fp); /* y buffer offest */ + CASE 0x02 : c1 = getc(fp); /* x buffer offset */ + c1 = getc(fp); /* y buffer offset */ rows -= c1; DEFAULT: for (i = 0; i < c; i++) { @@ -1462,8 +1462,8 @@ static int skip_rowsBMPC8(FILE *fp, UINT rows) case 0x00: rows--; CASE 0x01 : rows = 0; - CASE 0x02 : c1 = getc(fp); /* x buffer offest */ - c1 = getc(fp); /* y buffer offest */ + CASE 0x02 : c1 = getc(fp); /* x buffer offset */ + c1 = getc(fp); /* y buffer offset */ rows -= c1; DEFAULT: for (i = 0; i < c; i++) getc(fp); diff --git a/toonz/sources/image/mov/tiio_movM.cpp b/toonz/sources/image/mov/tiio_movM.cpp index 06057ed..f61b55c 100644 --- a/toonz/sources/image/mov/tiio_movM.cpp +++ b/toonz/sources/image/mov/tiio_movM.cpp @@ -996,7 +996,7 @@ TLevelWriterMov::~TLevelWriterMov() { QTMetaDataRef metaDataRef; if ((mderr = QTCopyMovieMetaData(m_movie, &metaDataRef)) != noErr) throw TImageException(getFilePath(), - "can't access metadata informations"); + "can't access metadata information"); if ((mderr = QTMetaDataAddItem( metaDataRef, kQTMetaDataStorageFormatUserData, @@ -1004,7 +1004,7 @@ TLevelWriterMov::~TLevelWriterMov() { firstFrameKeySize, (const UInt8 *)(&m_firstFrame), sizeof(int), kQTMetaDataTypeUnsignedIntegerBE, 0)) != noErr) throw TImageException(getFilePath(), - "can't insert metadata informations"); + "can't insert metadata information"); QTMetaDataRelease(metaDataRef); } @@ -1229,7 +1229,7 @@ TLevelP TLevelReaderMov::loadToonzOutputFormatInfo() { // atom. QTMetaDataRef metaDataRef; if ((mderr = QTCopyMovieMetaData(m_movie, &metaDataRef)) != noErr) - throw TImageException(m_path, "can't access metadata informations"); + throw TImageException(m_path, "can't access metadata information"); QTMetaDataItem firstFrameItem; @@ -1247,7 +1247,7 @@ TLevelP TLevelReaderMov::loadToonzOutputFormatInfo() { if ((mderr = QTMetaDataGetItemValue(metaDataRef, firstFrameItem, (UInt8 *)(&firstFrame), sizeof(int), 0) != noErr)) - throw TImageException(m_path, "can't read metadata informations"); + throw TImageException(m_path, "can't read metadata information"); } mderr = 0; diff --git a/toonz/sources/image/mov/tiio_movW.cpp b/toonz/sources/image/mov/tiio_movW.cpp index f026920..f415e00 100644 --- a/toonz/sources/image/mov/tiio_movW.cpp +++ b/toonz/sources/image/mov/tiio_movW.cpp @@ -822,7 +822,7 @@ TLevelWriterMov::~TLevelWriterMov() { QTMetaDataRef metaDataRef; if ((mderr = QTCopyMovieMetaData(m_movie, &metaDataRef)) != noErr) throw TImageException(getFilePath(), - "can't access metadata informations"); + "can't access metadata information"); if ((mderr = QTMetaDataAddItem( metaDataRef, kQTMetaDataStorageFormatUserData, @@ -830,7 +830,7 @@ TLevelWriterMov::~TLevelWriterMov() { firstFrameKeySize, (const UInt8 *)(&m_firstFrame), sizeof(int), kQTMetaDataTypeUnsignedIntegerBE, 0)) != noErr) throw TImageException(getFilePath(), - "can't insert metadata informations"); + "can't insert metadata information"); QTMetaDataRelease(metaDataRef); } @@ -1096,7 +1096,7 @@ TLevelP TLevelReaderMov::loadToonzOutputFormatInfo() { // atom. QTMetaDataRef metaDataRef; if ((mderr = QTCopyMovieMetaData(m_movie, &metaDataRef)) != noErr) - throw TImageException(m_path, "can't access metadata informations"); + throw TImageException(m_path, "can't access metadata information"); QTMetaDataItem firstFrameItem; @@ -1114,7 +1114,7 @@ TLevelP TLevelReaderMov::loadToonzOutputFormatInfo() { if ((mderr = QTMetaDataGetItemValue(metaDataRef, firstFrameItem, (UInt8 *)(&firstFrame), sizeof(int), 0) != noErr)) - throw TImageException(m_path, "can't read metadata informations"); + throw TImageException(m_path, "can't read metadata information"); } mderr = 0; diff --git a/toonz/sources/include/avicodecrestrictions.h b/toonz/sources/include/avicodecrestrictions.h index 7212ab5..5e9b2b4 100644 --- a/toonz/sources/include/avicodecrestrictions.h +++ b/toonz/sources/include/avicodecrestrictions.h @@ -21,13 +21,13 @@ namespace AviCodecRestrictions { -//! Returns a text specifing resolution restricions for the given codec name. +//! Returns a text specifying resolution restricions for the given codec name. void DVAPI getRestrictions(const std::wstring &codecName, QString &restrictions); //! Returns true if the ginven codec can work in the given resolution. bool DVAPI canWriteMovie(const std::wstring &codecName, const TDimension &resolution); -//! Return a mapping containing the same codecs in \b codecNames, specifing +//! Return a mapping containing the same codecs in \b codecNames, specifying //! which codec can work in the given resolution. QMap DVAPI getUsableCodecs(const TDimension &resolution); //! Returns true if the specifiedcodec can be configured. diff --git a/toonz/sources/include/drawutil.h b/toonz/sources/include/drawutil.h index 1f93227..6627649 100644 --- a/toonz/sources/include/drawutil.h +++ b/toonz/sources/include/drawutil.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // drawutil.h: -// Private header to common fuction in drawcurves.cpp and drawregions.cpp +// Private header to common function in drawcurves.cpp and drawregions.cpp //----------------------------------------------------------------------------- #ifndef DRAWUTIL_H diff --git a/toonz/sources/include/ext/CompositeStatus.h b/toonz/sources/include/ext/CompositeStatus.h index 254fadd..6dbcc83 100644 --- a/toonz/sources/include/ext/CompositeStatus.h +++ b/toonz/sources/include/ext/CompositeStatus.h @@ -28,7 +28,7 @@ namespace ToonzExt { /** - * This class mantains interal data for Dragger manipulator. + * This class maintains internal data for Dragger manipulator. */ class DVAPI CompositeStatus { private: diff --git a/toonz/sources/include/ext/LinearPotential.h b/toonz/sources/include/ext/LinearPotential.h index 1c8f7ae..bb02211 100644 --- a/toonz/sources/include/ext/LinearPotential.h +++ b/toonz/sources/include/ext/LinearPotential.h @@ -48,7 +48,7 @@ private: * @brief Range of mapping * * Only an interval of potential function will be used to -* map the tranformation. +* map the transformation. */ range_, par_, //! Parameter of selection. diff --git a/toonz/sources/include/ext/StrokeDeformation.h b/toonz/sources/include/ext/StrokeDeformation.h index 7c87055..8cb7673 100644 --- a/toonz/sources/include/ext/StrokeDeformation.h +++ b/toonz/sources/include/ext/StrokeDeformation.h @@ -46,7 +46,7 @@ class StrokeDeformationImpl; /** * @brief This class is the interface for manipulation - * algorihms. + * algorithms. * * StrokeDeformation is a wrapper for for StrokeDeformationImpl, * its function is to verify state and parameteres before diff --git a/toonz/sources/include/ext/meshtexturizer.h b/toonz/sources/include/ext/meshtexturizer.h index 89b3aa0..a3cf5fd 100644 --- a/toonz/sources/include/ext/meshtexturizer.h +++ b/toonz/sources/include/ext/meshtexturizer.h @@ -39,7 +39,7 @@ to the \a number of allowed textures, there \a are limits to the \b size of said textures, which can be tested by asking OpenGL whether it can - accomodate specific + accommodate specific texture requests or not. Technically, the MeshTexturizer class acts as a virtualization @@ -143,7 +143,7 @@ private: \details The purpose of MeshTexturizer is that of storing in VRAM a set of textures - cut up into tiles. This struture holds the data about the + cut up into tiles. This structure holds the data about the end-product of texture loading into a MeshTexturizer instance. */ diff --git a/toonz/sources/include/ext/plasticdeformerstorage.h b/toonz/sources/include/ext/plasticdeformerstorage.h index 0d6e4f8..cef230e 100644 --- a/toonz/sources/include/ext/plasticdeformerstorage.h +++ b/toonz/sources/include/ext/plasticdeformerstorage.h @@ -107,7 +107,7 @@ private: \par Rationale - The crucial reason behind the existance of this class lies in the + The crucial reason behind the existence of this class lies in the necessity to cache PlasticDeformer instances to achieve real-time speed in the processing of part of its algorithms. \n\n diff --git a/toonz/sources/include/stdfx/shadingcontext.h b/toonz/sources/include/stdfx/shadingcontext.h index 078edf7..4b923dd 100644 --- a/toonz/sources/include/stdfx/shadingcontext.h +++ b/toonz/sources/include/stdfx/shadingcontext.h @@ -55,7 +55,7 @@ public: /*! Resizes the output buffer to the specified size. Requires that -the contex is made current before invocation. In case lx or ly are 0, +the context is made current before invocation. In case lx or ly are 0, the context's output buffer is destroyed. */ void resize(int lx, int ly, const QOpenGLFramebufferObjectFormat &fmt = diff --git a/toonz/sources/include/tcg/pool.h b/toonz/sources/include/tcg/pool.h index b556eb5..502ee57 100644 --- a/toonz/sources/include/tcg/pool.h +++ b/toonz/sources/include/tcg/pool.h @@ -44,12 +44,12 @@ The classical cache concept is nothing more than that of a standard associative - map, tweaked to accomodate specific commodities - such as managing + map, tweaked to accommodate specific commodities - such as managing the cache size. However, sometimes resources could be considered to be effectively - indentical, + identical, to the point that assigning a key is merely a way to keep the objects distinct in the cache. Users are in the condition to require only diff --git a/toonz/sources/include/tcommon.h b/toonz/sources/include/tcommon.h index 162f3b8..86f6f7a 100644 --- a/toonz/sources/include/tcommon.h +++ b/toonz/sources/include/tcommon.h @@ -68,7 +68,7 @@ namespace TConsts { const double epsilon = 1e-8; } -// use macros insted of constexprs, because MSVC2013 does not support +// use macros instead of constexprs, because MSVC2013 does not support // `constexpr`. #define M_PI_3 (M_PI / 3) #define M_PI_180 (M_PI_4 / 45) diff --git a/toonz/sources/include/tfont.h b/toonz/sources/include/tfont.h index 1a368f7..290a9da 100644 --- a/toonz/sources/include/tfont.h +++ b/toonz/sources/include/tfont.h @@ -123,7 +123,7 @@ public: bool isBold(const QString &family, const QString &style); bool isItalic(const QString &family, const QString &style); - // --------- TFont methods called on curren font ----------- + // --------- TFont methods called on current font ----------- TPoint drawChar(TVectorImageP &outImage, wchar_t charcode, wchar_t nextCode = 0) { diff --git a/toonz/sources/include/tfxcachemanager.h b/toonz/sources/include/tfxcachemanager.h index 280be3e..fee015b 100644 --- a/toonz/sources/include/tfxcachemanager.h +++ b/toonz/sources/include/tfxcachemanager.h @@ -99,7 +99,7 @@ public: // Cache Management internals //************************************************************************************************ -//! The ResourceDeclaration structure contains the informations retrieved in the +//! The ResourceDeclaration structure contains the information retrieved in the //! predictive processes performed before a render process. It can be retrieved //! via the TFxCacheManager::getResource() method or passed directly by it to //! TFxCacheManagerDelegate instances. @@ -182,7 +182,7 @@ TFxCacheManagerDelegate instances. Access to a cache resource is performed through the getResource() method, which requires a description of the resource (as specified in the TCacheResource class) -and some informations - namely, the fx, render settings and frame - about the +and some information - namely, the fx, render settings and frame - about the circumstances of the request. If the resource is managed by some manager delegate, it will be returned. diff --git a/toonz/sources/include/tgeometry.h b/toonz/sources/include/tgeometry.h index af418cd..bbcd801 100644 --- a/toonz/sources/include/tgeometry.h +++ b/toonz/sources/include/tgeometry.h @@ -925,7 +925,7 @@ return *this = *this * b; }; */ /*! - Retruns the inverse tansformation as: + Returns the inverse tansformation as:

    \f$\left(\begin{array}{ccc}\bf{A}^{-1}&-\bf{A}^{-1}&\vec{b}\\\vec{0}&\vec{0}&1\end{array}\right)\f$

    */ @@ -1024,7 +1024,7 @@ a12*a12+a21*a21) < err; */ /*! - Retruns the transfomed point. + Returns the transformed point. */ TPointD operator*(const TPointD &p) const; /*Sposto in tgeometry.cpp @@ -1034,7 +1034,7 @@ return TPointD(p.x*a11+p.y*a12+a13, p.x*a21+p.y*a22+a23); */ /*! - Retruns the transformed box of the bounding box. + Returns the transformed box of the bounding box. */ TRectD operator*(const TRectD &rect) const; diff --git a/toonz/sources/include/tiio_jpg_exif.h b/toonz/sources/include/tiio_jpg_exif.h index 1d619d8..b84be1e 100644 --- a/toonz/sources/include/tiio_jpg_exif.h +++ b/toonz/sources/include/tiio_jpg_exif.h @@ -11,7 +11,7 @@ http://www.sentex.net/~mwandel/jhead/ #include -// undefining ReadAllTags will load only resolution infomation +// undefining ReadAllTags will load only resolution information #define ReadAllTags #undef ReadAllTags diff --git a/toonz/sources/include/tmathutil.h b/toonz/sources/include/tmathutil.h index 6a2e5a7..df56563 100644 --- a/toonz/sources/include/tmathutil.h +++ b/toonz/sources/include/tmathutil.h @@ -46,7 +46,7 @@ public: \par A array of coeff \par n size of matrix \par indx array with permutation from pivoting - \par d +1/-1 and depend wheter the number of row interchanges (even or odd) + \par d +1/-1 and depend whether the number of row interchanges (even or odd) \note If error a TException is thrown. \include mathutils_ex2.cpp */ diff --git a/toonz/sources/include/tmsgcore.h b/toonz/sources/include/tmsgcore.h index eb606d3..15bbab1 100644 --- a/toonz/sources/include/tmsgcore.h +++ b/toonz/sources/include/tmsgcore.h @@ -53,7 +53,7 @@ public: // client side // 'send' returns false if the tmessage is not active in the application - // (tipically, in console applications such as tcomposer) + // (typically, in console applications such as tcomposer) bool send(DVGui::MsgType type, const QString &message); void connectTo(const QString &address = ""); diff --git a/toonz/sources/include/tools/levelselection.h b/toonz/sources/include/tools/levelselection.h index 5c28191..dbae1fc 100644 --- a/toonz/sources/include/tools/levelselection.h +++ b/toonz/sources/include/tools/levelselection.h @@ -35,7 +35,7 @@ class TVectorImage; //******************************************************************************* /*! - \brief Selection type for level-based multi-frame selections targetting + \brief Selection type for level-based multi-frame selections targeting primitives described by predefined filtering functions. */ @@ -50,7 +50,7 @@ public: }; enum Filter //! Possible selection filters. - { EMPTY, //!< Selection is empty - everyting is filtered out. + { EMPTY, //!< Selection is empty - everything is filtered out. WHOLE, //!< Selects everything - nothing is filtered out. SELECTED_STYLES, //!< Acts only entities with selected palette styles. BOUNDARY_STROKES, //!< Acts only on boundary strokes (applies only to diff --git a/toonz/sources/include/tools/tool.h b/toonz/sources/include/tools/tool.h index a6af754..548b91e 100644 --- a/toonz/sources/include/tools/tool.h +++ b/toonz/sources/include/tools/tool.h @@ -369,7 +369,7 @@ public: /*! Picks a region of the scene, using an OpenGL projection matrix to restrict drawing to a small regionaround \p p of the viewport. - Retuns -1 if no object's view has been changed. + Returns -1 if no object's view has been changed. */ int pick(const TPointD &p); bool isPicking() const { return m_picking; } diff --git a/toonz/sources/include/tools/tooloptions.h b/toonz/sources/include/tools/tooloptions.h index 81a84e6..58e296c 100644 --- a/toonz/sources/include/tools/tooloptions.h +++ b/toonz/sources/include/tools/tooloptions.h @@ -276,7 +276,7 @@ protected slots: void onFrameSwitched() { updateStatus(); } // update the object list in combobox void updateStageObjectComboItems(); - // syncronize the current item in the combobox to the selected stage object + // synchronize the current item in the combobox to the selected stage object void syncCurrentStageObjectComboItem(); // change the current stage object when user changes it via combobox by hand void onCurrentStageObjectComboActivated(int index); diff --git a/toonz/sources/include/toonz/boardsettings.h b/toonz/sources/include/toonz/boardsettings.h index 98dacbb..3ff2576 100644 --- a/toonz/sources/include/toonz/boardsettings.h +++ b/toonz/sources/include/toonz/boardsettings.h @@ -62,7 +62,7 @@ private: // font color QColor m_color; - // font (familiy, bold, italic) + // font (family, bold, italic) QFont m_font; QString m_text; diff --git a/toonz/sources/include/toonz/doubleparamcmd.h b/toonz/sources/include/toonz/doubleparamcmd.h index 99f15a8..730e037 100644 --- a/toonz/sources/include/toonz/doubleparamcmd.h +++ b/toonz/sources/include/toonz/doubleparamcmd.h @@ -53,7 +53,7 @@ public: void selectKeyframe(int kIndex); // create a new keyframe, select it and returns its k-index - // (if a keyframe already exsist at frame then it is equivalent to + // (if a keyframe already exists at frame then it is equivalent to // selectKeyframe) // note: call createKeyframe() when no other keyframes are selected int createKeyframe(double frame); @@ -92,7 +92,7 @@ public: double similarShapeOffset); // addUndo is called automatically (if needed) in the dtor. - // it is also possible to call it explictly. + // it is also possible to call it explicitly. void addUndo(); static void setValue(TDoubleParam *curve, double frame, double value) { diff --git a/toonz/sources/include/toonz/expressionreferencemonitor.h b/toonz/sources/include/toonz/expressionreferencemonitor.h index 61c3774..e2aa099 100644 --- a/toonz/sources/include/toonz/expressionreferencemonitor.h +++ b/toonz/sources/include/toonz/expressionreferencemonitor.h @@ -25,7 +25,7 @@ class DVAPI ExpressionReferenceMonitorInfo { // true if the parameter is not monitored bool m_ignored = false; // column indices to which the parameter refers. - // note that the columns refered by the "cell" syntax will be + // note that the columns referred by the "cell" syntax will be // registered in this container, but not in the paramRefMap. QSet m_colRefMap; // parameters to which the parameter refers diff --git a/toonz/sources/include/toonz/fill.h b/toonz/sources/include/toonz/fill.h index 588e4a0..cc4972c 100644 --- a/toonz/sources/include/toonz/fill.h +++ b/toonz/sources/include/toonz/fill.h @@ -61,7 +61,7 @@ class TTileSaverFullColor; //============================================================================= -// returns true if the savebox is changed 9tipically, if you fill the bg) +// returns true if the savebox is changed typically, if you fill the bg) DVAPI bool fill(const TRasterCM32P &r, const FillParameters ¶ms, TTileSaverCM32 *saver = 0); diff --git a/toonz/sources/include/toonz/ikjacobian.h b/toonz/sources/include/toonz/ikjacobian.h index 7151dca..de863de 100644 --- a/toonz/sources/include/toonz/ikjacobian.h +++ b/toonz/sources/include/toonz/ikjacobian.h @@ -704,10 +704,10 @@ private: VectorRn dPreTheta; // (vale solo per SDLS) - // Parameters for pseudorinverse + // Parameters for pseudoinverse static const double PseudoInverseThresholdFactor; - // Paremeters for the Damped Least Squares method + // Parameters for the Damped Least Squares method static const double DefaultDampingLambda; double DampingLambda; double DampingLambdaSq; diff --git a/toonz/sources/include/toonz/imagemanager.h b/toonz/sources/include/toonz/imagemanager.h index 171c6a3..dd5aba7 100644 --- a/toonz/sources/include/toonz/imagemanager.h +++ b/toonz/sources/include/toonz/imagemanager.h @@ -282,7 +282,7 @@ protected: //! external data. virtual bool getInfo(TImageInfo &info, int imFlags, void *extData) = 0; - // load icon (and image) data of all frames into cache. impremented in + // load icon (and image) data of all frames into cache. implemented in // ImageLoader virtual void buildAllIconsAndPutInCache(TXshSimpleLevel *, std::vector, diff --git a/toonz/sources/include/toonz/imagepainter.h b/toonz/sources/include/toonz/imagepainter.h index cc864a0..684f864 100644 --- a/toonz/sources/include/toonz/imagepainter.h +++ b/toonz/sources/include/toonz/imagepainter.h @@ -55,7 +55,7 @@ public: // Other (misplaced) misc options - bool m_doCompare; //!< Whehter must compare between two images + bool m_doCompare; //!< Whether must compare between two images bool m_defineLoadbox; //!< Flipbook-specific bool m_useLoadbox; //!< Flipbook-specific @@ -66,7 +66,7 @@ public: bool m_recomputeIfNeeded; bool m_drawBlankFrame; bool m_useChecks; //!< whether to consider paint check and ink check - bool m_forSceneIcon = false; // whether it is redered for the scene icons + bool m_forSceneIcon = false; // whether it is rendered for the scene icons public: VisualSettings(); diff --git a/toonz/sources/include/toonz/levelproperties.h b/toonz/sources/include/toonz/levelproperties.h index 93ce2f0..7bd3adb 100644 --- a/toonz/sources/include/toonz/levelproperties.h +++ b/toonz/sources/include/toonz/levelproperties.h @@ -212,7 +212,7 @@ public: ie only \a fully white pixels will be replaced with transparent. This implicityl restrains its applicability to images without - antialias. This is therefore coupled with antialiasing settins. + antialias. This is therefore coupled with antialiasing settings. \sa The setDoAntialias() method. */ void setWhiteTransp(bool whiteTransp) //! Whether full white pixels should diff --git a/toonz/sources/include/toonz/levelupdater.h b/toonz/sources/include/toonz/levelupdater.h index aee6a3a..5666b9c 100644 --- a/toonz/sources/include/toonz/levelupdater.h +++ b/toonz/sources/include/toonz/levelupdater.h @@ -105,7 +105,7 @@ class DVAPI LevelUpdater { TLevelWriterP m_lw; //!< The updater's level writer object TFilePath m_lwPath; //!< Path of the file written by m_lw, could be a temporary - TPropertyGroup *m_pg; //!< Copy of the file format propeties used by m_lw + TPropertyGroup *m_pg; //!< Copy of the file format properties used by m_lw TLevelReaderP m_lr; //!< The updater's level reader object TLevelP m_inputLevel; //!< The initial source level frames structure @@ -119,7 +119,7 @@ class DVAPI LevelUpdater { bool m_usingTemporaryFile; //!< Whether a temporary file is being used to //! hold additional frames - bool m_opened; //!< Wheter the updater is already attached to a level + bool m_opened; //!< Whether the updater is already attached to a level public: LevelUpdater(); diff --git a/toonz/sources/include/toonz/sceneresources.h b/toonz/sources/include/toonz/sceneresources.h index 6f2370e..192b42d 100644 --- a/toonz/sources/include/toonz/sceneresources.h +++ b/toonz/sources/include/toonz/sceneresources.h @@ -300,11 +300,11 @@ used in subXsheet. void save(const TFilePath newScenePath); /*! -Update all resouces paths. +Update all resources paths. */ void updatePaths(); /*! -Set all resouces paths to old paths. +Set all resources paths to old paths. */ void rollbackPaths(); /*! diff --git a/toonz/sources/include/toonz/skeleton.h b/toonz/sources/include/toonz/skeleton.h index 49f8ce5..4f3de45 100644 --- a/toonz/sources/include/toonz/skeleton.h +++ b/toonz/sources/include/toonz/skeleton.h @@ -61,7 +61,7 @@ public: TPointD m_center; // position of the rotation center of the stageobject, // i.e. the "joint" bool m_selected; // true if the bone belongs to the active chain (i.e. - // handle <-> pinned ponts) + // handle <-> pinned points) PinnedStatus m_pinnedStatus; }; // class Bone @@ -75,7 +75,7 @@ public: ~Skeleton(); //! create a skeleton containing 'col'. - //! tempPinnedColumns contains the column indices of the temporarly pinned + //! tempPinnedColumns contains the column indices of the temporarily pinned //! bones void build(TXsheet *xsh, int row, int col, const std::set &tempPinnedColumns = std::set()); diff --git a/toonz/sources/include/toonz/tdistort.h b/toonz/sources/include/toonz/tdistort.h index e878e5d..df2e331 100644 --- a/toonz/sources/include/toonz/tdistort.h +++ b/toonz/sources/include/toonz/tdistort.h @@ -223,7 +223,7 @@ private: //! Compute the matrix used to distort image. //! First is compute a transformation A' starting from m_startPoints to (0,0), //! (0,1), (1,1), (1,0); - //! the a second tranformation A'' is compute starting from (0,0), (0,1), + //! the second transformation A'' is computed starting from (0,0), (0,1), //! (1,1), (1,0) to m_endPoints. //! The resulting matrix is A'*A''. void computeMatrix(); diff --git a/toonz/sources/include/toonz/toonzscene.h b/toonz/sources/include/toonz/toonzscene.h index 55e92ad..679ca41 100644 --- a/toonz/sources/include/toonz/toonzscene.h +++ b/toonz/sources/include/toonz/toonzscene.h @@ -116,11 +116,11 @@ public: const TFilePath path) const; //!< Builds the path to be used during a //!< level import operation. - /*! \details If convertion is required, a new level file will be created + /*! \details If conversion is required, a new level file will be created and \p levelPath will be substituted with its new path. \return Whether the level doesn't need to be converted or - the convertion succeeded. */ + the conversion succeeded. */ bool convertLevelIfNeeded(TFilePath &levelPath); //!< Checks if the given //! levelPath is a file path @@ -169,7 +169,7 @@ Return scene frame count. int getFrameCount() const; /*! -Returs frame count stored in the scene header. +Returns frame count stored in the scene header. Quicker than load(fp); getFrameCount() */ int loadFrameCount(const TFilePath &fp); @@ -250,7 +250,7 @@ If \b scene is in +scenes/name.tnz return name, //! gets the contentHistory. possibly creates a new one (if createIfNeeded) TContentHistory *getContentHistory(bool createIfNeeded = false); - // shifts camera offet, returning old value; usend for steroscophy + // shifts camera offset, returning old value; usend for steroscophy double shiftCameraX(double val); void setVersionNumber(VersionNumber version) { m_versionNumber = version; } @@ -265,7 +265,7 @@ If \b scene is in +scenes/name.tnz return name, private: TFilePath m_scenePath; //!< Full path to the scene file (.tnz). - ChildStack *m_childStack; //!< Xsheet hierachy. + ChildStack *m_childStack; //!< Xsheet hierarchy. TSceneProperties *m_properties; TLevelSet *m_levelSet; TProject *m_project; diff --git a/toonz/sources/include/toonz/tstageobject.h b/toonz/sources/include/toonz/tstageobject.h index 8862177..2de19fe 100644 --- a/toonz/sources/include/toonz/tstageobject.h +++ b/toonz/sources/include/toonz/tstageobject.h @@ -138,7 +138,7 @@ The default value is XY. The Keyframe struct define a keyframe. A keyframe allows to define object values in a specific frame. Keyframes are the starting and ending points of a transition in a scene. - Its parameters are taken as references to make changes on the paramters of + Its parameters are taken as references to make changes on the parameters of other frames, as: @@ -313,7 +313,7 @@ object. //! Returns true if \e frame is a keyframe for all channels. bool isFullKeyframe(int frame) const; - //! Returns true if \e frame is a keyframe for all channels with exeption of + //! Returns true if \e frame is a keyframe for all channels with exception of //! global scale channel. bool is52FullKeyframe(int frame) const; @@ -435,7 +435,7 @@ Doesn't delete \e this. */ void detachFromParent(); - //! Makes all children of \e this childern of \e parentId. + //! Makes all children of \e this children of \e parentId. void attachChildrenToParent(const TStageObjectId &parentId); //! Resets the area position setting internal time of the object and of all @@ -445,8 +445,8 @@ Doesn't delete \e this. /*! Return true if current object is visible, if object position in z-axis is less than 1000; othrwise return false. - \n Set \b TAffine \b aff to current object trasformation matrix computed - using camera and object trasformation matrix, + \n Set \b TAffine \b aff to current object transformation matrix computed + using camera and object transformation matrix, \b cameraAff, \b objectAff, and using camera and object position in z-axis, \b cameraZ, \b objectZ. \n \b objectZ default value is zero, big value describe the nearest camera diff --git a/toonz/sources/include/toonz/tstageobjecttree.h b/toonz/sources/include/toonz/tstageobjecttree.h index 44d94cc..cdd56b2 100644 --- a/toonz/sources/include/toonz/tstageobjecttree.h +++ b/toonz/sources/include/toonz/tstageobjecttree.h @@ -120,7 +120,7 @@ parent of the removed column. void removeColumn(int index); /*! - Remove from current stage objetc tree the stage objetc with \b + Remove from current stage object tree the stage object with \b TStageObjectId \b \e id. \n It doesn't delete the stage object. \sa insertStageObject() and removeColumn() @@ -133,7 +133,7 @@ TStageObjectId \b \e id. */ void insertStageObject(TStageObject *object); /*! - This method swaps colum \b \e i with column \b \e j. + This method swaps column \b \e i with column \b \e j. Columns \b \e i and \b \e j must exist. */ void swapColumns(int i, int j); @@ -187,7 +187,7 @@ Returns the numbers of the objects in the tree. An Handle Manager is an object that implements a method to retrieve the point position of the handle given its id and its name. - See TStageObject::getHandle() for an explanation of what an hanlde is. + See TStageObject::getHandle() for an explanation of what a handle is. */ void setHandleManager(HandleManager *hm); /*! @@ -271,7 +271,7 @@ index \b \e cameraIndex. return getCamera(TStageObjectId::CameraId(cameraIndex)); } /*! -Return a pointer to current stage objetc tree camera \b TCamera. +Return a pointer to current stage object tree camera \b TCamera. \sa getCamera() and getCurrentCameraId() */ inline TCamera *getCurrentCamera() { return getCamera(getCurrentCameraId()); } diff --git a/toonz/sources/include/toonz/txshcolumn.h b/toonz/sources/include/toonz/txshcolumn.h index fe3fb0f..526e08b 100644 --- a/toonz/sources/include/toonz/txshcolumn.h +++ b/toonz/sources/include/toonz/txshcolumn.h @@ -40,7 +40,7 @@ class TFx; \b TXshCellColumn, \b TXshSoundColumn and TXshPaletteColumn. The class contains all features about a generic xsheet column and gives - all methods to access to these informations. + all methods to access to these information. The createEmpty() static method creates an new empty column. diff --git a/toonz/sources/include/toonz/txsheet.h b/toonz/sources/include/toonz/txsheet.h index 53bdd8c..5989d8a 100644 --- a/toonz/sources/include/toonz/txsheet.h +++ b/toonz/sources/include/toonz/txsheet.h @@ -60,7 +60,7 @@ class ExpressionReferenceMonitor; // TXsheet declaration //**************************************************************************************** -//! This is the base class for an xsheet. An Xsheet is composed of colums of +//! This is the base class for an xsheet. An Xsheet is composed of columns of //! frames. /*! Inherits \b TSmartObject and \b TPersist. @@ -76,7 +76,7 @@ ToonzScene. For purposes of this class, a Column is a graphics layer, and a row is a frame number. - (Whether horizontal or vertial is a matter of displaying). + (Whether horizontal or vertical is a matter of displaying). A \b column \b set contains all xsheet columns. A collection of functions, concerning column @@ -587,7 +587,7 @@ private: TXsheet(const TXsheet &); TXsheet &operator=(const TXsheet &); - /*! Return column in index if exists, overwise create a new column; + /*! Return column in index if exists, otherwise create a new column; if column exist and is empty check \b isSoundColumn and return right type. */ TXshColumn *touchColumn(int index, diff --git a/toonz/sources/include/toonz/txshlevel.h b/toonz/sources/include/toonz/txshlevel.h index 820fce5..7cee418 100644 --- a/toonz/sources/include/toonz/txshlevel.h +++ b/toonz/sources/include/toonz/txshlevel.h @@ -37,7 +37,7 @@ class TXshSoundTextLevel; \b TXshChildLevel, \b TXshSimpleLevel and \b TXshZeraryFxLevel. The class contains all features about a generic level and gives all methods - to access to these informations. + to access to these information. It's possible ot know level name, getName(), or identify level types getType(), diff --git a/toonz/sources/include/toonz/txshnoteset.h b/toonz/sources/include/toonz/txshnoteset.h index 50a5e3e..1f59bb9 100644 --- a/toonz/sources/include/toonz/txshnoteset.h +++ b/toonz/sources/include/toonz/txshnoteset.h @@ -30,7 +30,7 @@ public: struct Note { //! Default colors are defined in TSceneProperties int m_colorIndex; - //! Is html test, contains font inforamtion. + //! Is html test, contains font information. QString m_text; int m_row; int m_col; diff --git a/toonz/sources/include/toonz/vectorizerparameters.h b/toonz/sources/include/toonz/vectorizerparameters.h index 707ed5a..49e3682 100644 --- a/toonz/sources/include/toonz/vectorizerparameters.h +++ b/toonz/sources/include/toonz/vectorizerparameters.h @@ -33,12 +33,12 @@ class TOStream; /*! \brief Provides a base container for vectorization options. - \details All vectorization options and informations are passed from higher + \details All vectorization options and information are passed from higher (like \p VectorizerPopup) to lower layers (\p VectorizerCore) of the vectorization process inside a \p VectorizerConfiguration variable. This typically includes vectorization modes, various sensitivity and - accuracy parameters, and post-processing informations. This class + accuracy parameters, and post-processing information. This class merely acts as a base parameters container (although no pure virtual method is present) - meaning that every vectorization method inherits diff --git a/toonz/sources/include/toonz4.6/tnzmovie.h b/toonz/sources/include/toonz4.6/tnzmovie.h index a4e3343..20c3609 100644 --- a/toonz/sources/include/toonz4.6/tnzmovie.h +++ b/toonz/sources/include/toonz4.6/tnzmovie.h @@ -129,7 +129,7 @@ TNZAPI TBOOL tm_append_raster(TNZMOVIE movie, MY_RASTER r); /************************************************************** Append a .wav(NT) or .aiff(IRIX) audio file to the movie. The length of the resulting movie is forced to be equal to the video track, -so any overflowing audio is truncated. For this reason, is adviced to add +so any overflowing audio is truncated. For this reason, is advised to add the audio when the video part has been completely added. The position can be a negative value too; If 'position' is >0, the audio track is added beginning from video frame diff --git a/toonz/sources/include/toonz4.6/toonzproc.h b/toonz/sources/include/toonz4.6/toonzproc.h index 4b6a86c..0d79b8c 100644 --- a/toonz/sources/include/toonz4.6/toonzproc.h +++ b/toonz/sources/include/toonz4.6/toonzproc.h @@ -34,7 +34,7 @@ typedef void (*TPROC_FUNC)(void); /********************************************************************** Runs without sospending executable filename. A set of arguments to be -passed can be setted in the NULL-terminated array argv. First argument +passed can be set in the NULL-terminated array argv. First argument MUST NOT be executable name. **********************************************************************/ @@ -42,7 +42,7 @@ TNZAPI T_PID tproc_run_process(char *filename, char *argv[]); /********************************************************************** Runs sospending executable filename. A set of arguments to be -passed can be setted in the NULL-terminated array argv. First argument +passed can be set in the NULL-terminated array argv. First argument MUST NOT be executable name. Returns TRUE if specified process was successfully executed, FALSE otherwise. **********************************************************************/ diff --git a/toonz/sources/include/toonzqt/doublepairfield.h b/toonz/sources/include/toonzqt/doublepairfield.h index 7d8799d..6160e05 100644 --- a/toonz/sources/include/toonzqt/doublepairfield.h +++ b/toonz/sources/include/toonzqt/doublepairfield.h @@ -213,7 +213,7 @@ signals: DoublePairField* doublePairFieldExample = new DoublePairField(this); doublePairFieldExample->setLeftText(tr("Left Value:")); - doublePairFieldExample->setRightText(tr("Rigth + doublePairFieldExample->setRightText(tr("Right Value:")); doublePairFieldExample->setRange(0,10); doublePairFieldExample->setValues(std::make_pair(3.58,7.65)); @@ -240,7 +240,7 @@ public: MeasuredDoublePairField* doublePairFieldExample = new MeasuredDoublePairField(this); doublePairFieldExample->setLeftText(tr("Left Value:")); - doublePairFieldExample->setRightText(tr("Rigth + doublePairFieldExample->setRightText(tr("Right Value:")); doublePairFieldExample->setRange(0,10); doublePairFieldExample->setValues(std::make_pair(3.58,7.65)); diff --git a/toonz/sources/include/toonzqt/dvscrollwidget.h b/toonz/sources/include/toonzqt/dvscrollwidget.h index ddbaeeb..97f2798 100644 --- a/toonz/sources/include/toonzqt/dvscrollwidget.h +++ b/toonz/sources/include/toonzqt/dvscrollwidget.h @@ -53,7 +53,7 @@ class QTimer; available content space in that direction. They are \a empty by default, but can be filled in or styled with a style sheet. - In the latter case, they are given an object name dependant on the + In the latter case, they are given an object name dependent on the scroll orientation - in the form ScrollButton. diff --git a/toonz/sources/include/toonzqt/flipconsole.h b/toonz/sources/include/toonzqt/flipconsole.h index 35ab885..b9de6cf 100644 --- a/toonz/sources/include/toonzqt/flipconsole.h +++ b/toonz/sources/include/toonzqt/flipconsole.h @@ -239,7 +239,7 @@ public: const QString &customizeId, FlipConsoleOwner *consoleOwner, // call // consoleOwner->onDrawFrame() - // intead of emitting drawFrame + // instead of emitting drawFrame // signal bool enableBlanks = false); void enableBlanks(bool state); diff --git a/toonz/sources/include/toonzqt/functionpanel.h b/toonz/sources/include/toonzqt/functionpanel.h index f58b9f1..412d916 100644 --- a/toonz/sources/include/toonzqt/functionpanel.h +++ b/toonz/sources/include/toonzqt/functionpanel.h @@ -142,7 +142,7 @@ public: double xToFrame(double x) const; double frameToX(double frame) const; - // note: the y-unit depends on the unit (e.g. degress, inches,..) and + // note: the y-unit depends on the unit (e.g. degrees, inches,..) and // therefore on the curve double valueToY(TDoubleParam *curve, double value) const; double yToValue(TDoubleParam *curve, double y) const; diff --git a/toonz/sources/include/toonzqt/functionsegmentviewer.h b/toonz/sources/include/toonzqt/functionsegmentviewer.h index c05ddcb..982fcd5 100644 --- a/toonz/sources/include/toonzqt/functionsegmentviewer.h +++ b/toonz/sources/include/toonzqt/functionsegmentviewer.h @@ -77,7 +77,7 @@ public: void refresh(); - // overriden from TDoubleParamObserver + // overridden from TDoubleParamObserver void onChange(const TParamChange &) override { refresh(); } void setXsheetHandle(TXsheetHandle *xshHandle) { m_xshHandle = xshHandle; } @@ -200,7 +200,7 @@ public: void refresh() override; void apply() override; - // return false if a circular reference is occured + // return false if a circular reference is occurred bool getGuiValues(std::string &expressionText, std::string &unitName); void init(int segmentLength) override; diff --git a/toonz/sources/include/toonzqt/fxschematicscene.h b/toonz/sources/include/toonzqt/fxschematicscene.h index 1907db2..4fc5ce1 100644 --- a/toonz/sources/include/toonzqt/fxschematicscene.h +++ b/toonz/sources/include/toonzqt/fxschematicscene.h @@ -137,8 +137,8 @@ public: void simulateDisconnectSelection(bool disconnect); //! Updates all Group Editors containing fx. - //! Each fx is only in one group, but each gruop can contains othe group. All - //! nested Groups must be updated. + //! Each fx is only in one group, but each group can contains other groups. + //! All nested Groups must be updated. void updateNestedGroupEditors(FxSchematicNode *node, const QPointF &newPos); void closeInnerMacroEditor(int groupId); void resizeNodes(bool maximizedNode); diff --git a/toonz/sources/include/toonzqt/intpairfield.h b/toonz/sources/include/toonzqt/intpairfield.h index 1bc282c..fe3cea3 100644 --- a/toonz/sources/include/toonzqt/intpairfield.h +++ b/toonz/sources/include/toonzqt/intpairfield.h @@ -67,7 +67,7 @@ namespace DVGui { IntPairField* intPairFieldExample = new IntPairField(this); intPairFieldExample->setLeftText(tr("Left Value:")); - intPairFieldExample->setRightText(tr("Rigth Value:")); + intPairFieldExample->setRightText(tr("Right Value:")); intPairFieldExample->setRange(0,10); intPairFieldExample->setValues(std::make_pair(3,8)); \endcode diff --git a/toonz/sources/include/toonzqt/menubarcommand.h b/toonz/sources/include/toonzqt/menubarcommand.h index c707508..0839e23 100644 --- a/toonz/sources/include/toonzqt/menubarcommand.h +++ b/toonz/sources/include/toonzqt/menubarcommand.h @@ -155,7 +155,7 @@ public: QAction *getAction(CommandId id, bool createIfNeeded = false); - // createAction creates a new indepenent QAction with text and shortcut + // createAction creates a new independent QAction with text and shortcut // if the action is a toggle action (e.g. show/hide something) the text is // controlled by state // you can use createAction() for context menu diff --git a/toonz/sources/include/toonzqt/schematicnode.h b/toonz/sources/include/toonzqt/schematicnode.h index c426125..b599e54 100644 --- a/toonz/sources/include/toonzqt/schematicnode.h +++ b/toonz/sources/include/toonzqt/schematicnode.h @@ -257,13 +257,13 @@ public: SchematicPort *getEndPort() const { return m_endPort; } /*! Returns the other SchematicPort linked to the specified \b port.\n - Returns 0 if \b port isn't neither the start SchematicPort eihter the end + Returns 0 if \b port isn't neither the start SchematicPort either the end SchematicPort of this link.*/ SchematicPort *getOtherPort(const SchematicPort *port) const; /*! Returns the other SchematicNode linked to the specified \b node.\n Returns 0 if \b node isn't neither the parent node of the start SchematicPort - eihter the parent node of the end SchematicPort of the link.*/ + either the parent node of the end SchematicPort of the link.*/ SchematicNode *getOtherNode(const SchematicNode *node) const; //! Returns true if the link is line shaped. @@ -294,7 +294,7 @@ protected: links but can begin to draw links.\n A SchematicPort has got a hook thet is a position where links starts or ends.\n - A SchematicPort can be linked to an arbitriary number of links. + A SchematicPort can be linked to an arbitrary number of links. A SchematicPort handles a container of all links to retrieve all linked node; each link is indexed using a progressive number assigned when the link is inserted to the container. diff --git a/toonz/sources/include/toonzqt/schematicviewer.h b/toonz/sources/include/toonzqt/schematicviewer.h index 14e013d..675512c 100644 --- a/toonz/sources/include/toonzqt/schematicviewer.h +++ b/toonz/sources/include/toonzqt/schematicviewer.h @@ -90,7 +90,7 @@ protected: //! Returns \b true if no nodes intersects \b rect. bool isAnEmptyZone(const QRectF &rect); //! Returns a vector containing all nodes which had their bounding rects - //! conatined in \b node bounding + //! contained in \b node bounding //! rect enlarged of 10. QVector getPlacedNode(SchematicNode *node); diff --git a/toonz/sources/include/toonzqt/stageschematicscene.h b/toonz/sources/include/toonzqt/stageschematicscene.h index f36e9d8..cf67805 100644 --- a/toonz/sources/include/toonzqt/stageschematicscene.h +++ b/toonz/sources/include/toonzqt/stageschematicscene.h @@ -29,7 +29,7 @@ class StageSchematicGroupEditor; // //================================================================== //! Provide a structure representing a node af a tree. -//! This class mantains information about a node of the stage schematic and its +//! This class maintains information about a node of the stage schematic and its //! children. //! The tree is generated using the TStageObjectTree. //! The generated tree is used to oreder stage schematic nodes in the window. @@ -74,7 +74,7 @@ public: //! QGraphicsScene for the Stage Schematic. //! All StageSchematicNode, StageSchematicSplineNode and link are pleced and //! handled in this scene. -//! The scene mantains two mapping: +//! The scene maintains two mapping: //! one for StageSchematicNode and one for StageSchematicSplineNode. These //! mapping can be used to retrieve //! nodes and spline.\n diff --git a/toonz/sources/include/toonzqt/studiopaletteviewer.h b/toonz/sources/include/toonzqt/studiopaletteviewer.h index 0430d21..b5aa268 100644 --- a/toonz/sources/include/toonzqt/studiopaletteviewer.h +++ b/toonz/sources/include/toonzqt/studiopaletteviewer.h @@ -85,19 +85,19 @@ public: void setStdPaletteHandle(TPaletteHandle *stdPaletteHandle); TPaletteHandle *getStdPaletteHandle() const { return m_studioPaletteHandle; } - /*! Overriden from StudioPalette::Listener. */ + /*! Overridden from StudioPalette::Listener. */ void onStudioPaletteTreeChange() override { refresh(); } - /*! Overriden from StudioPalette::Listener. */ + /*! Overridden from StudioPalette::Listener. */ void onStudioPaletteMove(const TFilePath &dstPath, const TFilePath &srcPath) override { refresh(); } - /*! Overriden from StudioPalette::Listener. */ + /*! Overridden from StudioPalette::Listener. */ void onStudioPaletteChange(const TFilePath &palette) override { refresh(); } - /*! Overriden from TProjectManager::Listener. */ + /*! Overridden from TProjectManager::Listener. */ void onProjectSwitched() override { resetProjectPaletteFolder(); } - /*! Overriden from TProjectManager::Listener. */ + /*! Overridden from TProjectManager::Listener. */ void onProjectChanged() override { resetProjectPaletteFolder(); } TFilePath getCurrentItemPath() { return getItemPath(currentItem()); } diff --git a/toonz/sources/include/toonzqt/viewcommandids.h b/toonz/sources/include/toonzqt/viewcommandids.h index c8a8b3a..41ef0d8 100644 --- a/toonz/sources/include/toonzqt/viewcommandids.h +++ b/toonz/sources/include/toonzqt/viewcommandids.h @@ -15,7 +15,7 @@ #define V_RotateReset "T_RotateReset" #define V_PositionReset "T_PositionReset" -// folloing command ids are for command bar +// following command ids are for command bar #define VB_ViewReset "VB_ViewReset" #define VB_ZoomFit "VB_ZoomFit" #define VB_ZoomReset "VB_ZoomReset" diff --git a/toonz/sources/include/toutputproperties.h b/toonz/sources/include/toutputproperties.h index ded931c..ff12ee1 100644 --- a/toonz/sources/include/toutputproperties.h +++ b/toonz/sources/include/toutputproperties.h @@ -24,7 +24,7 @@ class BoardSettings; //============================================================================= //! The TOutputProperties class provides a container for output properties and -//! gives all methods to access to these informations. +//! gives all methods to access to these information. /*!The class contains all features necessaries to compute output and provides a collection of functions that return the various feature, and enable manipulation of these. @@ -42,18 +42,18 @@ class BoardSettings; The getWhichLevels() function return a value is used to characterize which levels are in output: - \li If value is TOutputProperties::AllLevels all levels are coputed in + \li If value is TOutputProperties::AllLevels all levels are computed in output. \li If value is TOutputProperties::SelectedOnly only selectecd levels are - coputed in output. + computed in output. \li If value is TOutputProperties::AnimatedOnly only animated levels are - coputed in output. + computed in output. It can be set by setWhichLevels(). - The getFileFormatProperties(string ext) function return file of fomat \b ext + The getFileFormatProperties(string ext) function return file of format \b ext properties \b TPropertyGroup. It's possibile set different format and have - appropriete properties. + appropriate properties. The getRenderSettings() function return render settings \b TRenderSettings, it can be change using setRenderSettings(). @@ -64,7 +64,7 @@ class DVAPI TOutputProperties { public: /*! This enum type is used to characterize which levels are in output. -Can set in output all lavel, only selectecd levels or only animated levels. +Can set in output to all levels, only selectecd levels or only animated levels. \sa getWhichLevels(), setWhichLevels() */ enum { AllLevels, SelectedOnly, AnimatedOnly }; diff --git a/toonz/sources/include/tpalette.h b/toonz/sources/include/tpalette.h index 971f79a..062b32a 100644 --- a/toonz/sources/include/tpalette.h +++ b/toonz/sources/include/tpalette.h @@ -74,7 +74,7 @@ Index \p 1 current implementation, copy and assignment are \a forbidden. This behavior is somewhat - inconsitent since a palette \b is currently \a clonable and \a assignable + inconsistent since a palette \b is currently \a clonable and \a assignable with the appropriate functions. Normalization to common C++ syntax should be enforced ASAP. @@ -204,10 +204,10 @@ private: bool m_isLocked; //!< Whether the palette is locked. bool m_askOverwriteFlag; //!< This variable is quite unique. This flag is to - //! acheive following beghavior: + //! achieve following behavior: //! When saving the level with the palette being edited, ask whether the //! palette - //! should be overwitten ONLY ONCE AT THE FIRST TIME. + //! should be overwritten ONLY ONCE AT THE FIRST TIME. //! The confirmation dialog will not be opened unless the palette is edited //! again, //! even if the palette's dirtyflag is true. @@ -333,7 +333,7 @@ between RGBA color components. bool isFromStudioPalette = false); //!< Copies src's page, color //! styles an animation table //! to the - //! correspondig features of the palette. + //! corresponding features of the palette. //! if the palette is copied from studio palette, this function will modify //! the original names. void merge(const TPalette *src, @@ -362,7 +362,7 @@ between RGBA color components. //! palette. void setRefImg(const TImageP &img); //!< Associates an image to this palette, //! that is an image in the frame - //! builded or modified using this palette. + //! built or modified using this palette. const TFilePath getRefImgPath() const { return m_refImgPath; diff --git a/toonz/sources/include/tparam.h b/toonz/sources/include/tparam.h index da957f3..6f05ae3 100644 --- a/toonz/sources/include/tparam.h +++ b/toonz/sources/include/tparam.h @@ -34,7 +34,7 @@ class DVAPI TParam : public TSmartObject, public TPersist { public: /*! - The contructor store the name of the parameter and initialize his + The constructor store the name of the parameter and initialize his interface with I/O through the class TPersist. */ TParam(std::string name = "", std::string description = "", diff --git a/toonz/sources/include/tpersist.h b/toonz/sources/include/tpersist.h index c5b15b8..055224b 100644 --- a/toonz/sources/include/tpersist.h +++ b/toonz/sources/include/tpersist.h @@ -112,7 +112,7 @@ inline std::string TPersist::getStreamTag() const { //------------------------------------------------------------------- /*! - This template class is used to create an istance of the class \a + This template class is used to create an instance of the class \a T. */ template diff --git a/toonz/sources/include/tpixel.h b/toonz/sources/include/tpixel.h index b3531cc..0b8fe5b 100644 --- a/toonz/sources/include/tpixel.h +++ b/toonz/sources/include/tpixel.h @@ -124,7 +124,7 @@ static inline TPixelRGBM32 from(const TPixelRGBM64 &pix); static TPixelRGBM32 from(const TPixelGR8 &pix); //!Converts TPixelGR16 into TPixelRGBM32 static TPixelRGBM32 from(const TPixelGR16 &pix); -//!In this conversion instead of truncating values fron 64 to 32 a randomic +//!In this conversion instead of truncating values from 64 to 32 a randomic dithering is performed. //!r is a unsigned int random value static inline TPixelRGBM32 from(const TPixelRGBM64 &pix, TUINT32 r); // per il diff --git a/toonz/sources/include/tpixelgr.h b/toonz/sources/include/tpixelgr.h index 8af211e..23066cf 100644 --- a/toonz/sources/include/tpixelgr.h +++ b/toonz/sources/include/tpixelgr.h @@ -50,12 +50,12 @@ public: inline void setValue(int _value) { value = (UCHAR)_value; } - //! In this conversion instead of truncating values fron 16 to 8 a randomic + //! In this conversion instead of truncating values from 16 to 8 a randomic //! dithering is performed. // randomNumber is an unsigned int random value static inline TPixelGR8 from(const TPixelGR16 &pix, TUINT32 randomNumber); // per il dithering - //! In this conversion instead of truncating values fron 64 to 8 a randomic + //! In this conversion instead of truncating values from 64 to 8 a randomic //! dithering is performed. // randomNumber is an unsigned int random value diff --git a/toonz/sources/include/traster.h b/toonz/sources/include/traster.h index 4fca77f..f1d737b 100644 --- a/toonz/sources/include/traster.h +++ b/toonz/sources/include/traster.h @@ -373,7 +373,7 @@ TRasterPT TRasterT::extractT(TRect &rect) { // // metodi inline di TRasterPT // (n.b. se non si fanno esplicitament "inline" NT si confonde con dll -// exort/import) +// export/import) // template diff --git a/toonz/sources/include/trasterfx.h b/toonz/sources/include/trasterfx.h index 7bc98c2..45795c8 100644 --- a/toonz/sources/include/trasterfx.h +++ b/toonz/sources/include/trasterfx.h @@ -38,7 +38,7 @@ class TPalette; //****************************************************************************** /*! - \brief Data class containing the relevant additional informations needed in + \brief Data class containing the relevant additional information needed in a render process. \details This class stores most of the data required by Toonz and single fxs @@ -55,7 +55,7 @@ class TPalette; render on the default reference. - \sa TRasterFx::compute() for further informations. + \sa TRasterFx::compute() for further information. */ class DVAPI TRenderSettings { diff --git a/toonz/sources/include/trenderer.h b/toonz/sources/include/trenderer.h index 40fcd3d..8296f2e 100644 --- a/toonz/sources/include/trenderer.h +++ b/toonz/sources/include/trenderer.h @@ -164,7 +164,7 @@ struct TRenderPort::RenderData { //! discouraged. Further //! improvements of the TRenderer's API will eventually make the need for these //! calls obsolete. However, -//! we've implemented the possibilty to rely on TRenderer's management support +//! we've implemented the possibility to rely on TRenderer's management support //! even in those cases - //! it can be done by declaring the render process' interesting events through //! the apposite declare..() <\a> diff --git a/toonz/sources/include/trenderresourcemanager.h b/toonz/sources/include/trenderresourcemanager.h index 559274a..9b0f3da 100644 --- a/toonz/sources/include/trenderresourcemanager.h +++ b/toonz/sources/include/trenderresourcemanager.h @@ -144,7 +144,7 @@ private: /*! \def MANAGER_FILESCOPE_DECLARATION(managerClass, generatorClass) This macro must be used at file scope to bind the manager to its generator instance - just place it after the generator definition. -\note In case the manager is dependant on some other manager, use the +\note In case the manager is dependent on some other manager, use the \c MANAGER_FILESCOPE_DECLARATION_DEP macro instead. */ diff --git a/toonz/sources/include/trop.h b/toonz/sources/include/trop.h index 6c80b10..7b060be 100644 --- a/toonz/sources/include/trop.h +++ b/toonz/sources/include/trop.h @@ -172,7 +172,7 @@ DVAPI void quickPut(const TRasterP &out, const TRasterCM32P &up, const TPixel32 &globalColorScale = TPixel::Black, bool inksOnly = false); -// for trasparency check, ink check and paint check +// for transparency check, ink check and paint check class CmappedQuickputSettings { public: diff --git a/toonz/sources/include/tsimplecolorstyles.h b/toonz/sources/include/tsimplecolorstyles.h index f992088..f28ebfc 100644 --- a/toonz/sources/include/tsimplecolorstyles.h +++ b/toonz/sources/include/tsimplecolorstyles.h @@ -41,7 +41,7 @@ class TVectorImage; //********************************************************************************** /*! - Base classs for stroke color styles. + Base class for stroke color styles. */ class DVAPI TSimpleStrokeStyle : public TColorStyle { diff --git a/toonz/sources/include/tsound.h b/toonz/sources/include/tsound.h index 1adfe8f..2d76aea 100644 --- a/toonz/sources/include/tsound.h +++ b/toonz/sources/include/tsound.h @@ -73,7 +73,7 @@ public: /*! The class TSoundTrack contains all features about a sound track - and gives all methods to access to these informations + and gives all methods to access to these information */ class DVAPI TSoundTrack : public TSmartObject { DECLARE_CLASS_CODE @@ -186,7 +186,7 @@ Blanks the soundtrack in the given range. Range is expressed in seconds. void blank(double t0, double t1); /*! -Returns a new soundtrack obtained applying the given sound tranform +Returns a new soundtrack obtained applying the given sound transform to the soundtrack */ virtual TSoundTrackP apply(TSoundTransform *) = 0; diff --git a/toonz/sources/include/tsound_t.h b/toonz/sources/include/tsound_t.h index 2cd567e..3188079 100644 --- a/toonz/sources/include/tsound_t.h +++ b/toonz/sources/include/tsound_t.h @@ -85,9 +85,9 @@ public: //---------------------------------------------------------------------------- /*! -Returns a soundtrack whom is a clone of the object for the spicified channel -A clone means that it's an object who lives indipendently from the other -from which it's created.It hasn't reference to the object. +Returns a soundtrack whom is a clone of the object for the spicified channel. +A clone means that it's an object who lives independently from the other +from which it's created. It has no reference to the object. */ TSoundTrackP clone(TSound::Channel chan) const override { if (getChannelCount() == 1) @@ -135,7 +135,7 @@ from which it's created.It hasn't reference to the object. //---------------------------------------------------------------------------- - //! Applies a trasformation (echo, reverb, ect) to the object and returns the + //! Applies a transformation (echo, reverb, ect) to the object and returns the //! transformed soundtrack TSoundTrackP apply(TSoundTransform *transform) override; //---------------------------------------------------------------------------- diff --git a/toonz/sources/include/tstream.h b/toonz/sources/include/tstream.h index 27d5367..3545147 100644 --- a/toonz/sources/include/tstream.h +++ b/toonz/sources/include/tstream.h @@ -199,7 +199,7 @@ public: \param compressed Enables compression of the whole file \note Stream construction does not throw . However, the stream - status could be invalid. Remeber to check the stream validity using + status could be invalid. Remember to check the stream validity using operator bool(). \warning Stream compression has been verified to be unsafe. diff --git a/toonz/sources/include/tstroke.h b/toonz/sources/include/tstroke.h index cff106e..19d622f 100644 --- a/toonz/sources/include/tstroke.h +++ b/toonz/sources/include/tstroke.h @@ -67,7 +67,7 @@ public: //! to be erased TStroke &operator=(const TStroke &other); - //! Costructor + //! Constructor TStroke(); //! Build a stroke from an array of ThickPoint. @@ -322,7 +322,7 @@ Split a stroke at parameter t //! change tangent versus in the stroke /*! change tangent versus in a stroke -\note Change versus of all thickquadratric and change its postion in list +\note Change versus of all thickquadratric and change its position in list */ TStroke &changeDirection(); diff --git a/toonz/sources/include/tstrokedeformations.h b/toonz/sources/include/tstrokedeformations.h index 6ecc301..1174703 100644 --- a/toonz/sources/include/tstrokedeformations.h +++ b/toonz/sources/include/tstrokedeformations.h @@ -218,7 +218,7 @@ public: /*! Use this constructor with increasePoints. - \param stroke a refernce to a stroke + \param stroke a reference to a stroke \param parameterOfNearest \param lengthOfDeformation */ diff --git a/toonz/sources/include/tsystem.h b/toonz/sources/include/tsystem.h index ddd01ae..16050ab 100644 --- a/toonz/sources/include/tsystem.h +++ b/toonz/sources/include/tsystem.h @@ -201,7 +201,7 @@ DVAPI TINT64 getMemorySize(bool onlyPhisicalMemory); /*! return true if not enough memory. It can happen for 2 reasons: 1) free phisical memory is close to 0; 2) the calling process has allocated the maximum amount of memory allowed - for a single process(tipically, for a 32 bits machine, 2GB)*/ + for a single process(typically, for a 32 bits machine, 2GB)*/ DVAPI bool memoryShortage(); diff --git a/toonz/sources/include/tthreadmessage.h b/toonz/sources/include/tthreadmessage.h index 67e1123..f7fa9a5 100644 --- a/toonz/sources/include/tthreadmessage.h +++ b/toonz/sources/include/tthreadmessage.h @@ -37,7 +37,7 @@ bool DVAPI isMainThread(); // executed the onDeliver function. // WARNING!! the sendblocking method will cause a deadlock if used in a // executable without main loop! (such as composer, cleanupper, etc.) -// NOTE: if the 'send' is called in the main thread, ther onDeliver is executed +// NOTE: if the 'send' is called in the main thread, then onDeliver is executed // immediately. class DVAPI Message { diff --git a/toonz/sources/include/ttoonzimage.h b/toonz/sources/include/ttoonzimage.h index bc1e983..eaf6ab8 100644 --- a/toonz/sources/include/ttoonzimage.h +++ b/toonz/sources/include/ttoonzimage.h @@ -74,11 +74,11 @@ public: //! Return the savebox of the image TRect getSavebox() const { return m_savebox; } //! Set the savebox of the image. - /*! The savebox setted is the intersection between \b rect and the image + /*! The set savebox is the intersection between \b rect and the image * box.*/ void setSavebox(const TRect &rect); - //! Return the boundin box of the image. + //! Return the bounding box of the image. TRectD getBBox() const override { return convert(m_savebox); } //! Return the offset point of the image. diff --git a/toonz/sources/include/tvectorimage.h b/toonz/sources/include/tvectorimage.h index 8af541a..d7d6cd8 100644 --- a/toonz/sources/include/tvectorimage.h +++ b/toonz/sources/include/tvectorimage.h @@ -299,7 +299,7 @@ get the stroke nearest at point /*! Includes a (transformed) copy of imgs in this. If setSelected==true then selects imported strokes. - It also includes the color informations. + It also includes the color information. Try to assign the same stroke ids (if unused) */ void enableRegionComputing(bool enabled, bool notIntersectingStrokes); @@ -310,8 +310,8 @@ get the stroke nearest at point void enableMinimizeEdges(bool enabled); /*! Creates a new Image using the selected strokes. If removeFlag==true then removes selected strokes - It includes (in the new image) the color informations too. - It mantains stroke ids. + It includes (in the new image) the color information too. + It maintains stroke ids. */ TVectorImageP splitSelected(bool removeFlag); diff --git a/toonz/sources/include/tw/popupmenu.h b/toonz/sources/include/tw/popupmenu.h index 084c04e..ed992a3 100644 --- a/toonz/sources/include/tw/popupmenu.h +++ b/toonz/sources/include/tw/popupmenu.h @@ -121,7 +121,7 @@ private: // see examples below // -/*---- Example 1 (position indipendent) ---- +/*---- Example 1 (position independent) ---- void Pluto::rightButtonUp(const TMouseEvent &e) { TContextMenu *menu = new TContextMenu(this); diff --git a/toonz/sources/include/tzerofinder.h b/toonz/sources/include/tzerofinder.h index 75fcc8b..8f7bfa2 100644 --- a/toonz/sources/include/tzerofinder.h +++ b/toonz/sources/include/tzerofinder.h @@ -56,7 +56,7 @@ bool findZero_Newton ( double x0 , for(i=0;i void computeBacklit(TRasterPT dst, TRasterPT src, const TPoint &srcPos, - // cordinate di src[0,0] rispetto a dst; + // coordinate di src[0,0] rispetto a dst; // in genere srcPos.x,.y <= 0 const TPoint ¢er // coordinate della sorgente di luce rispetto a dst; diff --git a/toonz/sources/stdfx/igs_level_auto.cpp b/toonz/sources/stdfx/igs_level_auto.cpp index 3edab11..6a76868 100644 --- a/toonz/sources/stdfx/igs_level_auto.cpp +++ b/toonz/sources/stdfx/igs_level_auto.cpp @@ -53,11 +53,11 @@ void level_ctable_template_(const unsigned int channels, const bool *act_sw, // user setting const int *in_min, // image pixel value const int *in_max, // image pixel value - const double *in_min_shift, // user settting - const double *in_max_shift, // user settting - const double *out_min, // user settting - const double *out_max, // user settting - const double *gamma, // user settting + const double *in_min_shift, // user setting + const double *in_max_shift, // user setting + const double *out_min, // user setting + const double *out_max, // user setting + const double *gamma, // user setting const unsigned int div_num, std::vector> &table_array /* diff --git a/toonz/sources/stdfx/igs_level_auto_in_camera.cpp b/toonz/sources/stdfx/igs_level_auto_in_camera.cpp index 9b562cf..ca08959 100644 --- a/toonz/sources/stdfx/igs_level_auto_in_camera.cpp +++ b/toonz/sources/stdfx/igs_level_auto_in_camera.cpp @@ -52,11 +52,11 @@ void level_ctable_template_(const unsigned int channels, const bool *act_sw, // user setting const int *in_min, // image pixel value const int *in_max, // image pixel value - const double *in_min_shift, // user settting - const double *in_max_shift, // user settting - const double *out_min, // user settting - const double *out_max, // user settting - const double *gamma, // user settting + const double *in_min_shift, // user setting + const double *in_max_shift, // user setting + const double *out_min, // user setting + const double *out_max, // user setting + const double *gamma, // user setting const unsigned int div_num, std::vector> &table_array /* diff --git a/toonz/sources/stdfx/igs_line_blur.cpp b/toonz/sources/stdfx/igs_line_blur.cpp index d94f86b..616c35b 100644 --- a/toonz/sources/stdfx/igs_line_blur.cpp +++ b/toonz/sources/stdfx/igs_line_blur.cpp @@ -268,7 +268,7 @@ list_node *list_root::pop(list_node *clp_old) { class brush_curve_blur { public: - /* constructer */ + /* constructor */ brush_curve_blur(void) { int32_t ii; @@ -290,7 +290,7 @@ public: this->_da_pixel[ii] = 0.0; } } - /* constructer */ + /* constructor */ ~brush_curve_blur(void) { this->mem_free(); } /* パラメータ設定 */ @@ -528,7 +528,7 @@ int brush_curve_blur::save(double d_xp, double d_yp, const char *cp_fname) { /* ピクセル位置から近点位置保存 */ if (fprintf(fp, "%g %g\n", d_xp + this->_dp_xp[ii], d_yp + this->_dp_yp[ii]) < 0) { - pri_funct_err_bttvr("Error : fprintf(avarage x y) returns minus"); + pri_funct_err_bttvr("Error : fprintf(average x y) returns minus"); fclose(fp); return NG; } @@ -3026,7 +3026,7 @@ void pixel_line_root::exec09_same_way_expand( clp_select->get_i32_count_max()); } - /* 各端点(one,anohter)ごと + /* 各端点(one,another)ごと 同方向線分となる端点の近点を探し、 それらの合成ベクトルによる角度との差を一時保管する */ for (clp_line = (pixel_line_node *)this->get_clp_first(), ii = 0; @@ -3049,7 +3049,7 @@ void pixel_line_root::exec09_same_way_expand( } } - /* 各端点(one,anohter)ごと + /* 各端点(one,ananother)ごと 伸ばした線分を、一時保管した角度に曲げる */ i32_count_one = 0; i32_count_another = 0; diff --git a/toonz/sources/stdfx/iwa_bloomfx.cpp b/toonz/sources/stdfx/iwa_bloomfx.cpp index c4643d9..a2018e8 100644 --- a/toonz/sources/stdfx/iwa_bloomfx.cpp +++ b/toonz/sources/stdfx/iwa_bloomfx.cpp @@ -235,7 +235,7 @@ void Iwa_BloomFx::doCompute(TTile &tile, double frame, // that the gaussian blur (x 2) and the blur by rotation resampling (x sqrt2) double blurScale = 1.0 + (double)blurRadius; double no_blur_size = size / (blurScale * 1.5); - // find the mimimum "power of 2" value which is the same as or larger than the + // find the minimum "power of 2" value which is the same as or larger than the // filter size int level = 1; double power_of_2 = 1.0; diff --git a/toonz/sources/stdfx/iwa_bokeh_advancedfx.h b/toonz/sources/stdfx/iwa_bokeh_advancedfx.h index 1272a0d..06d03c8 100644 --- a/toonz/sources/stdfx/iwa_bokeh_advancedfx.h +++ b/toonz/sources/stdfx/iwa_bokeh_advancedfx.h @@ -3,7 +3,7 @@ // Iwa_BokehAdvancedFx // Advanced version of Bokeh Fx Iwa // - Enabled to set different hardness for each layer -// - Enabled to apply the depth referene image for each layer +// - Enabled to apply the depth reference image for each layer //---------------------------------------- #ifndef IWA_BOKEH_ADVANCED_H diff --git a/toonz/sources/stdfx/iwa_bokeh_util.cpp b/toonz/sources/stdfx/iwa_bokeh_util.cpp index 451efb9..bd985f8 100644 --- a/toonz/sources/stdfx/iwa_bokeh_util.cpp +++ b/toonz/sources/stdfx/iwa_bokeh_util.cpp @@ -552,7 +552,7 @@ void BokehUtils::defineSegemntDepth( // amount if (std::abs(i - histo[i].belongingSegmentValue) > std::abs(i - h)) // the current segment value has - // proirity, if the distance is the same + // priority, if the distance is the same errorModAmount += (std::abs(i - histo[i].belongingSegmentValue) - std::abs(i - h)) * histo[i].pix_amount; @@ -578,7 +578,7 @@ void BokehUtils::defineSegemntDepth( // belongingSegmentValue if (std::abs(h - histo[h].belongingSegmentValue) > std::abs(h - tmpBestNewSegVal)) // the current segment value has - // proirity, if the distance is the same + // priority, if the distance is the same histo[h].belongingSegmentValue = tmpBestNewSegVal; } } diff --git a/toonz/sources/stdfx/iwa_fractalnoisefx.cpp b/toonz/sources/stdfx/iwa_fractalnoisefx.cpp index b734db0..e04817a 100644 --- a/toonz/sources/stdfx/iwa_fractalnoisefx.cpp +++ b/toonz/sources/stdfx/iwa_fractalnoisefx.cpp @@ -191,7 +191,7 @@ void Iwa_FractalNoiseFx::doCompute(TTile &tile, double frame, getSamplePos(x, y, outDim, out_buf, gen, scale, param); // multiply affine transformation samplePos = currentAff * samplePos; - // adjust postion for the block pattern + // adjust position for the block pattern if (param.noiseType == Block) samplePos = TPointD(std::floor(samplePos.x) + 0.5, std::floor(samplePos.y) + 0.5); diff --git a/toonz/sources/stdfx/iwa_motionblurfx.cpp b/toonz/sources/stdfx/iwa_motionblurfx.cpp index 0cd2b2f..b29a588 100644 --- a/toonz/sources/stdfx/iwa_motionblurfx.cpp +++ b/toonz/sources/stdfx/iwa_motionblurfx.cpp @@ -870,7 +870,7 @@ bool Iwa_MotionBlurCompFx::doGetBBox(double frame, TRectD &bBox, return false; } - /* Rough implemetation - return infinite size if the background is connected + /* Rough implementation - return infinite size if the background is connected */ if (m_background.isConnected()) { bool _ret = m_background->doGetBBox(frame, bBox, info); diff --git a/toonz/sources/stdfx/iwa_pnperspectivefx.cpp b/toonz/sources/stdfx/iwa_pnperspectivefx.cpp index ff4bf7e..60f2ced 100644 --- a/toonz/sources/stdfx/iwa_pnperspectivefx.cpp +++ b/toonz/sources/stdfx/iwa_pnperspectivefx.cpp @@ -471,7 +471,7 @@ void Iwa_PNPerspectiveFx::calcPNNormal_CPU(double4 *out_host, currentOffsetNoisePos[0].y, currentEvolution); } - // use center cell id if points are in the differnt cells + // use center cell id if points are in the different cells else { TPointD currentCenterNoisePos = (noisePos - currentOffset) * (1.0 / currentSize); @@ -517,7 +517,7 @@ void Iwa_PNPerspectiveFx::calcPNNormal_CPU(double4 *out_host, cam_vec = normalize(cam_vec); if (p.renderMode == PN_Params::WarpHV || p.renderMode == PN_Params::WarpHV2) { - // relfected vector from the plane + // reflected vector from the plane double alpha = dot(normal, cam_vec); double3 reflect_cam = { 2.0 * alpha * normal.x - cam_vec.x, diff --git a/toonz/sources/stdfx/iwa_soapbubblefx.h b/toonz/sources/stdfx/iwa_soapbubblefx.h index 7735b43..baf72a5 100644 --- a/toonz/sources/stdfx/iwa_soapbubblefx.h +++ b/toonz/sources/stdfx/iwa_soapbubblefx.h @@ -32,7 +32,7 @@ protected: TDoubleParamP m_center_opacity; TBoolParamP m_fit_thickness; - // obsolete parameter. to be conerted to m_center_opacity + // obsolete parameter. to be converted to m_center_opacity TBoolParamP m_mask_center; // noise parameters diff --git a/toonz/sources/stdfx/iwa_spectrumfx.cpp b/toonz/sources/stdfx/iwa_spectrumfx.cpp index 711a6f1..74bcb46 100644 --- a/toonz/sources/stdfx/iwa_spectrumfx.cpp +++ b/toonz/sources/stdfx/iwa_spectrumfx.cpp @@ -127,7 +127,7 @@ void Iwa_SpectrumFx::calcBubbleMap(float3 *bubbleColor, double frame, /* compute colors for two thickness values and fade them*/ for (int fadeId = 0; fadeId < 2; fadeId++) { - // if composit ratio is 0, skip computing + // if composite ratio is 0, skip computing if (tmp_ratio[fadeId] == 0.0f) continue; /* calculate the thickness of film (μm) */ diff --git a/toonz/sources/stdfx/iwa_tilefx.cpp b/toonz/sources/stdfx/iwa_tilefx.cpp index a68201a..0ecd646 100644 --- a/toonz/sources/stdfx/iwa_tilefx.cpp +++ b/toonz/sources/stdfx/iwa_tilefx.cpp @@ -73,11 +73,11 @@ Iwa_TileFx::Iwa_TileFx() bindParam(this, "leftQuantity", m_leftQuantity); m_leftQuantity->addItem(eOneTile, "1 Tile"); - m_leftQuantity->addItem(eMultipleTiles, "Mutiple Tiles"); + m_leftQuantity->addItem(eMultipleTiles, "Multiple Tiles"); bindParam(this, "rightQuantity", m_rightQuantity); m_rightQuantity->addItem(eOneTile, "1 Tile"); - m_rightQuantity->addItem(eMultipleTiles, "Mutiple Tiles"); + m_rightQuantity->addItem(eMultipleTiles, "Multiple Tiles"); bindParam(this, "xMirror", m_xMirror); @@ -86,11 +86,11 @@ Iwa_TileFx::Iwa_TileFx() bindParam(this, "topQuantity", m_topQuantity); m_topQuantity->addItem(eOneTile, "1 Tile"); - m_topQuantity->addItem(eMultipleTiles, "Mutiple Tiles"); + m_topQuantity->addItem(eMultipleTiles, "Multiple Tiles"); bindParam(this, "bottomQuantity", m_bottomQuantity); m_bottomQuantity->addItem(eOneTile, "1 Tile"); - m_bottomQuantity->addItem(eMultipleTiles, "Mutiple Tiles"); + m_bottomQuantity->addItem(eMultipleTiles, "Multiple Tiles"); bindParam(this, "yMirror", m_yMirror); diff --git a/toonz/sources/stdfx/localblurfx.cpp b/toonz/sources/stdfx/localblurfx.cpp index cf77e65..45f30af 100644 --- a/toonz/sources/stdfx/localblurfx.cpp +++ b/toonz/sources/stdfx/localblurfx.cpp @@ -10,7 +10,7 @@ NOTE: Current LocalBlurFx is effectively flawed. Following implementation relies on the idea that - the blurring filter is separable and therefore appliable on rows and + the blurring filter is separable and therefore applicable on rows and columns, in sequence. It actually is not. It can be easily verified applying the fx on a diff --git a/toonz/sources/stdfx/motionblurfx.cpp b/toonz/sources/stdfx/motionblurfx.cpp index 9d2de20..613b149 100644 --- a/toonz/sources/stdfx/motionblurfx.cpp +++ b/toonz/sources/stdfx/motionblurfx.cpp @@ -193,7 +193,7 @@ void do_filtering(T *row1, T *row2, int length, double coeff, int brad, for (i = 0; i < length; i++) /* for the ith point the previous computing is used, with the values */ { - /* stored in the auxiliar variables sigma1 and sigma2. */ + /* stored in the auxiliary variables sigma1 and sigma2. */ rsum = ((Mblur - i) * sigma1.r + sigma2.r) / coeff; gsum = ((Mblur - i) * sigma1.g + sigma2.g) / coeff; bsum = ((Mblur - i) * sigma1.b + sigma2.b) / coeff; @@ -532,7 +532,7 @@ void DirectionalBlurBaseFx::doCompute(TTile &tile, double frame, m_input->getBBox(frame, bboxIn, ri); if (bboxIn == TConsts::infiniteRectD) bboxIn = rectTile; TPointD blur = (1.0 / shrink) * (aff * blurVector); - // enlarge must be bidirectional, because we need pixel on the ohter side of + // enlarge must be bidirectional, because we need pixel on the other side of // blur enlargeDir(bboxIn, blur, true); rectTile = bboxIn * rectTile.enlarge(fabs(blur.x), fabs(blur.y)); diff --git a/toonz/sources/stdfx/pins.h b/toonz/sources/stdfx/pins.h index abdd717..9f61a35 100644 --- a/toonz/sources/stdfx/pins.h +++ b/toonz/sources/stdfx/pins.h @@ -46,7 +46,7 @@ public: bool operator!=(const FourPoints &fp) const { return !(*this == fp); } }; -// this function computes the perspective trasformation defined with +// this function computes the perspective transformation defined with //-transfFrom, transfTo- (the points in transfFrom goes in transfTo) // and applies it on the fourPoints from, and returns the result) FourPoints computeTransformed(const FourPoints &transfFrom, diff --git a/toonz/sources/stdfx/shaderfx.cpp b/toonz/sources/stdfx/shaderfx.cpp index 0996ce3..a3c1951 100644 --- a/toonz/sources/stdfx/shaderfx.cpp +++ b/toonz/sources/stdfx/shaderfx.cpp @@ -1059,7 +1059,7 @@ void ShaderFx::doCompute(TTile &tile, double frame, // Input tiles are NOT supplied to OpenGL here - but rather just before // drawing. - // It's probably beacuse a uniform integer variable must have already been + // It's probably because a uniform integer variable must have already been // bound // to prepare the associated sampler variable in the linkes program... } diff --git a/toonz/sources/stopmotion/stopmotion.cpp b/toonz/sources/stopmotion/stopmotion.cpp index 5e4ccff..ed204f0 100644 --- a/toonz/sources/stopmotion/stopmotion.cpp +++ b/toonz/sources/stopmotion/stopmotion.cpp @@ -1182,8 +1182,8 @@ void StopMotion::previousName() { std::wstring levelName; - // if the current level name is non-sequencial, then try to switch the last - // sequencial level in the scene. + // if the current level name is non-sequential, then try to switch the last + // sequential level in the scene. if (!nameCreator->setCurrent(m_levelName.toStdWString())) { TLevelSet *levelSet = TApp::instance()->getCurrentScene()->getScene()->getLevelSet(); diff --git a/toonz/sources/stopmotion/stopmotioncontroller.cpp b/toonz/sources/stopmotion/stopmotioncontroller.cpp index 080e85a..b5e7ba9 100644 --- a/toonz/sources/stopmotion/stopmotioncontroller.cpp +++ b/toonz/sources/stopmotion/stopmotioncontroller.cpp @@ -229,7 +229,7 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) { m_previousXSheetFrameButton = new QToolButton(this); m_onionOpacityFld = new DVGui::IntField(this); - // should choosing the file type is disabled for simplicty + // should choosing the file type is disabled for simplicity // too many options can be a bad thing m_fileTypeCombo = new QComboBox(this); m_fileFormatOptionButton = new QPushButton(tr("Options"), this); diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp index 8bcfb3e..72255c0 100644 --- a/toonz/sources/tcomposer/tcomposer.cpp +++ b/toonz/sources/tcomposer/tcomposer.cpp @@ -673,7 +673,7 @@ int main(int argc, char *argv[]) { // Set the app's locale for numeric stuff to standard C. This is important for // atof() and similar - // calls that are locale-dependant. + // calls that are locale-dependent. setlocale(LC_NUMERIC, "C"); // Install run out of contiguous memory callback diff --git a/toonz/sources/tnzext/CompositeStatus.cpp b/toonz/sources/tnzext/CompositeStatus.cpp index f784371..fd7b569 100644 --- a/toonz/sources/tnzext/CompositeStatus.cpp +++ b/toonz/sources/tnzext/CompositeStatus.cpp @@ -15,7 +15,7 @@ namespace ToonzExt { //--------------------------------------------------------------------------- /** *@class CompositeStatus - *@brief This class mantains interal data for Dragger manipulator. + *@brief This class maintains internal data for Dragger manipulator. */ CompositeStatus::CompositeStatus() : dbImpl_(new std::map), db_(*dbImpl_) {} diff --git a/toonz/sources/tnzext/DeformationSelector.h b/toonz/sources/tnzext/DeformationSelector.h index 9d8d541..47ea629 100644 --- a/toonz/sources/tnzext/DeformationSelector.h +++ b/toonz/sources/tnzext/DeformationSelector.h @@ -15,7 +15,7 @@ namespace ToonzExt { * Priority can manage simply some strange case (corner that * seems to be straight corner and smooth corner). * - * @note Selection can be overriden by user. + * @note Selection can be overridden by user. * @note Private use only. */ class DeformationSelector { diff --git a/toonz/sources/tnzext/StrokeStatus.cpp b/toonz/sources/tnzext/StrokeStatus.cpp index 1357fb5..ff17123 100644 --- a/toonz/sources/tnzext/StrokeStatus.cpp +++ b/toonz/sources/tnzext/StrokeStatus.cpp @@ -15,7 +15,7 @@ namespace ToonzExt { //--------------------------------------------------------------------------- /** *@class StrokeStatus - *@brief This class mantains interal data for Dragger manipulator. + *@brief This class maintains internal data for Dragger manipulator. */ StrokeStatus::StrokeStatus(TStroke *stroke2change, unsigned int n, double w, diff --git a/toonz/sources/tnztools/bendertool.cpp b/toonz/sources/tnztools/bendertool.cpp index 5293679..53f8061 100644 --- a/toonz/sources/tnztools/bendertool.cpp +++ b/toonz/sources/tnztools/bendertool.cpp @@ -480,9 +480,9 @@ void BenderTool::findCurves(TVectorImageP &vi) { TStroke *s = vi->getStroke(i); // a useful reference - std::vector pair_intersection; // informations about extremes + std::vector pair_intersection; // information about extremes - // if there is interesection between stroke and bender tool + // if there is intersection between stroke and bender tool if (intersect(*s, m_benderSegment, pair_intersection)) { if (s->isSelfLoop()) { diff --git a/toonz/sources/tnztools/edittool.cpp b/toonz/sources/tnztools/edittool.cpp index c9055c1..e42d6a6 100644 --- a/toonz/sources/tnztools/edittool.cpp +++ b/toonz/sources/tnztools/edittool.cpp @@ -1703,7 +1703,7 @@ bool EditTool::onPropertyChanged(std::string propertyName) { int EditTool::getCursorId() const { int ret; - // cursor for controling the fx gadget + // cursor for controlling the fx gadget if (m_highlightedDevice >= 1000) ret = ToolCursor::FxGadgetCursor; else if (transformEnabled()) { diff --git a/toonz/sources/tnztools/fingertool.cpp b/toonz/sources/tnztools/fingertool.cpp index 38fae90..d4f1d05 100644 --- a/toonz/sources/tnztools/fingertool.cpp +++ b/toonz/sources/tnztools/fingertool.cpp @@ -302,7 +302,7 @@ FingerTool fingerTool; //============================================================================= // -// InkPaintTool implemention +// InkPaintTool implementation // //----------------------------------------------------------------------------- diff --git a/toonz/sources/tnztools/imagegrouping.cpp b/toonz/sources/tnztools/imagegrouping.cpp index 43fc537..f34dcbd 100644 --- a/toonz/sources/tnztools/imagegrouping.cpp +++ b/toonz/sources/tnztools/imagegrouping.cpp @@ -258,7 +258,7 @@ std::vector> getSelectedGroups(TVectorImage *vimg, return ret; } -} // namepsace +} // namespace //-------------------------------------------------------------------------------------- diff --git a/toonz/sources/tnztools/paintbrushtool.cpp b/toonz/sources/tnztools/paintbrushtool.cpp index 4799e6e..de316b3 100644 --- a/toonz/sources/tnztools/paintbrushtool.cpp +++ b/toonz/sources/tnztools/paintbrushtool.cpp @@ -308,7 +308,7 @@ PaintBrushTool paintBrushTool; //============================================================================= // -// InkPaintTool implemention +// InkPaintTool implementation // //----------------------------------------------------------------------------- diff --git a/toonz/sources/tnztools/pinchtool.cpp b/toonz/sources/tnztools/pinchtool.cpp index 81c4167..af22d37 100644 --- a/toonz/sources/tnztools/pinchtool.cpp +++ b/toonz/sources/tnztools/pinchtool.cpp @@ -478,7 +478,7 @@ void PinchTool::mouseMove(const TPointD &pos, const TMouseEvent &event) { // update information about current stroke updateStrokeStatus(stroke, w); - // retrieve the currect m_deformation and + // retrieve the current m_deformation and // prepare to design and modify if (m_deformation) m_deformation->check(status); diff --git a/toonz/sources/tnztools/rastererasertool.cpp b/toonz/sources/tnztools/rastererasertool.cpp index 2dae3d0..0d98c65 100644 --- a/toonz/sources/tnztools/rastererasertool.cpp +++ b/toonz/sources/tnztools/rastererasertool.cpp @@ -568,7 +568,7 @@ EraserTool inkPaintEraserTool("T_Eraser"); //================================================================================================== // -// InkPaintTool implemention +// InkPaintTool implementation // //------------------------------------------------------------------------ diff --git a/toonz/sources/tnztools/rasterselection.cpp b/toonz/sources/tnztools/rasterselection.cpp index 904fd12..4003a3e 100644 --- a/toonz/sources/tnztools/rasterselection.cpp +++ b/toonz/sources/tnztools/rasterselection.cpp @@ -931,7 +931,7 @@ void RasterSelection::notify() { //! Empty the selection. //! If the selection is floating, the floating image is pasted using the current -//! tranformation. +//! transformation. void RasterSelection::selectNone() { if (isFloating()) { pasteFloatingSelection(); diff --git a/toonz/sources/tnztools/rgbpickertool.cpp b/toonz/sources/tnztools/rgbpickertool.cpp index 261ef4e..4b1f4f6 100644 --- a/toonz/sources/tnztools/rgbpickertool.cpp +++ b/toonz/sources/tnztools/rgbpickertool.cpp @@ -239,7 +239,7 @@ void RGBPickerTool::updateTranslation() { // Used to notify and set the currentColor outside the draw() methods: // using special style there was a conflict between the draw() methods of the // tool -// and the genaration of the icon inside the style editor (makeIcon()) which use +// and the generation of the icon inside the style editor (makeIcon()) which use // another glContext void RGBPickerTool::onImageChanged() { diff --git a/toonz/sources/tnztools/rgbpickertool.h b/toonz/sources/tnztools/rgbpickertool.h index 6905364..604ff15 100644 --- a/toonz/sources/tnztools/rgbpickertool.h +++ b/toonz/sources/tnztools/rgbpickertool.h @@ -52,7 +52,7 @@ public: // Used to notify and set the currentColor outside the draw() methods: // using special style there was a conflict between the draw() methods of the // tool - // and the genaration of the icon inside the style editor (makeIcon()) which + // and the generation of the icon inside the style editor (makeIcon()) which // use // another glContext diff --git a/toonz/sources/tnztools/tool.cpp b/toonz/sources/tnztools/tool.cpp index d56042e..503035e 100644 --- a/toonz/sources/tnztools/tool.cpp +++ b/toonz/sources/tnztools/tool.cpp @@ -597,7 +597,7 @@ TTool::Application *TTool::getApplication() { //----------------------------------------------------------------------------- /*! Notify change of current image: update icon and notify level change. - If current object is a spline commit spline chenged. + If current object is a spline commit spline changed. If current mode is EditingLevel touch current frame. */ void TTool::notifyImageChanged() { diff --git a/toonz/sources/tnztools/toolhandle.cpp b/toonz/sources/tnztools/toolhandle.cpp index 8ce17b1..bd5d307 100644 --- a/toonz/sources/tnztools/toolhandle.cpp +++ b/toonz/sources/tnztools/toolhandle.cpp @@ -42,7 +42,7 @@ void ToolHandle::setTool(QString name) { if (m_tool) m_tool->onDeactivate(); - // Camera test uses the automaticly activated CameraTestTool + // Camera test uses the automatically activated CameraTestTool if (name != "T_CameraTest" && CameraTestCheck::instance()->isEnabled()) CameraTestCheck::instance()->setIsEnabled(false); diff --git a/toonz/sources/tnztools/tooloptions.cpp b/toonz/sources/tnztools/tooloptions.cpp index 1310199..63214ed 100644 --- a/toonz/sources/tnztools/tooloptions.cpp +++ b/toonz/sources/tnztools/tooloptions.cpp @@ -943,7 +943,7 @@ void ArrowToolOptionsBox::updateStageObjectComboItems() { } //------------------------------------------------------------------------------ -/*! syncronize the current item in the combobox to the selected stage object +/*! synchronize the current item in the combobox to the selected stage object */ void ArrowToolOptionsBox::syncCurrentStageObjectComboItem() { TStageObjectId curObjId = m_objHandle->getObjectId(); diff --git a/toonz/sources/tnztools/toonzvectorbrushtool.cpp b/toonz/sources/tnztools/toonzvectorbrushtool.cpp index e190c61..a13c79c 100644 --- a/toonz/sources/tnztools/toonzvectorbrushtool.cpp +++ b/toonz/sources/tnztools/toonzvectorbrushtool.cpp @@ -794,7 +794,7 @@ void ToonzVectorBrushTool::leftButtonDrag(const TPointD &pos, invalidateRect += TRectD(m_brushPos - halfThick, m_brushPos + halfThick); if (!invalidateRect.isEmpty()) { - // for motion path, call the invalidate function directry to ignore dpi of + // for motion path, call the invalidate function directly to ignore dpi of // the current level if (m_isPath) m_viewer->GLInvalidateRect(invalidateRect.enlarge(2)); diff --git a/toonz/sources/tnztools/vectorerasertool.cpp b/toonz/sources/tnztools/vectorerasertool.cpp index 0fc6ae4..7b8e0a9 100644 --- a/toonz/sources/tnztools/vectorerasertool.cpp +++ b/toonz/sources/tnztools/vectorerasertool.cpp @@ -369,7 +369,7 @@ private: } eraserTool; //============================================================================= -// EraserTool implemention +// EraserTool implementation //----------------------------------------------------------------------------- EraserTool::EraserTool() @@ -1406,7 +1406,7 @@ void EraserTool::eraseSegments(const TVectorImageP vi, TStroke *eraseStroke) { ranges = complement; } - // calculate how many lines are added for caculating the final index of added + // calculate how many lines are added for calculating the final index of added // strokes int added = 0; for (int i = touchedStrokeIndex.size() - 1; i >= 0; --i) { diff --git a/toonz/sources/tnztools/vectorselectiontool.h b/toonz/sources/tnztools/vectorselectiontool.h index 39ae022..dff9ce3 100644 --- a/toonz/sources/tnztools/vectorselectiontool.h +++ b/toonz/sources/tnztools/vectorselectiontool.h @@ -153,7 +153,7 @@ public: void applyTransform(FourPoints bbox, bool onFastDragging = false) override; void addTransformUndo() override; - /*! Trasform whole level and add undo. */ + /*! Transform whole level and add undo. */ void transformWholeLevel(); bool isFlip(); diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index 95e5511..fd87193 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -541,7 +541,7 @@ if(BUILD_ENV_APPLE) message("CMAKE_RUNTIME_OUTPUT_DIRECTORY:" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) endif() -# copy utilty executables onto the directory after build +# copy utility executables onto the directory after build if(LZODRIVER_FOUND) add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzocompress) add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzodecompress) diff --git a/toonz/sources/toonz/ObjectTracker.cpp b/toonz/sources/toonz/ObjectTracker.cpp index 9878f70..d79a781 100644 --- a/toonz/sources/toonz/ObjectTracker.cpp +++ b/toonz/sources/toonz/ObjectTracker.cpp @@ -30,7 +30,7 @@ using namespace std; #define MAX_FLOAT 3.40282e+38; //--------------------------------------------------------------------------------------------------------- -// Costructor +// Constructor CObjectTracker::CObjectTracker(int imW, int imH, bool _colorimage, bool _att_background, bool _man_occlusion) { att_background = _att_background; @@ -353,7 +353,7 @@ void CObjectTracker::FindWightsAndCOM(TRaster32P *frame, float(*histogram)) { std::unique_ptr weights(new float[HISTOGRAM_LENGTH]); - // weigths + // weights for (i = 0; i < HISTOGRAM_LENGTH; i++) { if (histogram[i] > 0.0) weights[i] = sqrt(m_sTrackingObject.initHistogram[i] / histogram[i]); diff --git a/toonz/sources/toonz/adjustthicknesspopup.h b/toonz/sources/toonz/adjustthicknesspopup.h index edaa239..f718fd9 100644 --- a/toonz/sources/toonz/adjustthicknesspopup.h +++ b/toonz/sources/toonz/adjustthicknesspopup.h @@ -83,7 +83,7 @@ public: public: /*! \remark Value STROKES restricts m_framesType to SELECTED_FRAMES, and - m_frameIdxs to a sigle element. */ + m_frameIdxs to a single element. */ ContentType m_contentType; //!< Content type of the selection. FramesType m_framesType; //!< Frames type of the selection. diff --git a/toonz/sources/toonz/autoinputcellnumberpopup.cpp b/toonz/sources/toonz/autoinputcellnumberpopup.cpp index 83261d2..d0a87a2 100644 --- a/toonz/sources/toonz/autoinputcellnumberpopup.cpp +++ b/toonz/sources/toonz/autoinputcellnumberpopup.cpp @@ -329,7 +329,7 @@ void AutoInputCellNumberPopup::doExecute(bool overwrite) { cellSelection->selectCells(r0, c0, r0 + undo->rowsCount() - 1, c1); TApp::instance()->getCurrentSelection()->notifySelectionChanged(); } - // If exection is properly completed, then close this popup + // If execution is properly completed, then close this popup close(); } @@ -393,7 +393,7 @@ bool AutoInputCellNumberPopup::getTarget(std::vector &columnIndices, // something must be selected if (selection->isEmpty()) return false; - // selection must be cells or collumns + // selection must be cells or columns TCellSelection *cellSelection = dynamic_cast(selection); TColumnSelection *columnSelection = dynamic_cast(selection); diff --git a/toonz/sources/toonz/boardsettingspopup.cpp b/toonz/sources/toonz/boardsettingspopup.cpp index f538ed9..b916345 100644 --- a/toonz/sources/toonz/boardsettingspopup.cpp +++ b/toonz/sources/toonz/boardsettingspopup.cpp @@ -964,7 +964,7 @@ void BoardSettingsPopup::hideEvent(QHideEvent* event) { // called on changing the current row of ItemListView void BoardSettingsPopup::onCurrentItemSwitched(int index) { - // updat Info + // update Info m_itemInfoView->setCurrentItem(index); m_boardView->update(); diff --git a/toonz/sources/toonz/cachefxcommand.cpp b/toonz/sources/toonz/cachefxcommand.cpp index 8f83771..563d98c 100644 --- a/toonz/sources/toonz/cachefxcommand.cpp +++ b/toonz/sources/toonz/cachefxcommand.cpp @@ -85,13 +85,13 @@ CacheFxCommand::CacheFxCommand() { TApp *app = TApp::instance(); bool ret = true; - // Connect the variuos handles to the associated function in the + // Connect the various handles to the associated function in the // CacheFxCommand singleton. // Please observe that these connections are performed BEFORE rendering // classes are instanced - // which is needed to ensure that the proper cache updates have already been // performed when - // rendering instaces receive the update signal. + // rendering instances receive the update signal. // ret = ret && // connect(app->getCurrentLevel(),SIGNAL(xshLevelChanged()),this,SLOT(onLevelChanged())); @@ -202,7 +202,7 @@ for(j=0; jisCacheEnabled()) { std::set terminalFxs; diff --git a/toonz/sources/toonz/cleanuppopup.cpp b/toonz/sources/toonz/cleanuppopup.cpp index 1458370..653a63b 100644 --- a/toonz/sources/toonz/cleanuppopup.cpp +++ b/toonz/sources/toonz/cleanuppopup.cpp @@ -1008,7 +1008,7 @@ QString CleanupPopup::setupLevel() { app->getPaletteController()->getCurrentLevelPalette()->setPalette( palette.getPointer()); - // Notify the xsheet that the level has changed visual type informations + // Notify the xsheet that the level has changed visual type information // (either the level type, // cleanup status, etc) app->getCurrentXsheet()->notifyXsheetChanged(); @@ -1475,7 +1475,7 @@ CleanupPopup::OverwriteDialog::OverwriteDialog() suffixLayout->addWidget(m_suffix); } - addLayout(suffixLayout); // Couldnt' place it right after allocation, + addLayout(suffixLayout); // Couldn't place it right after allocation, // DVGui::Dialog::addLayout() crashed... // Option 5: NOPAINT_ONLY radioButton = new QRadioButton(this); diff --git a/toonz/sources/toonz/colormodelviewer.cpp b/toonz/sources/toonz/colormodelviewer.cpp index 6b5fb27..8fa96a4 100644 --- a/toonz/sources/toonz/colormodelviewer.cpp +++ b/toonz/sources/toonz/colormodelviewer.cpp @@ -441,7 +441,7 @@ void ColorModelViewer::changePickType() { //----------------------------------------------------------------------------- /*! If current palette level exists reset image viewer and set current viewer - to refences image path level. + to reference image path level. */ void ColorModelViewer::updateViewer() { getImageViewer()->repaint(); } diff --git a/toonz/sources/toonz/columncommand.cpp b/toonz/sources/toonz/columncommand.cpp index 504fb98..372af70 100644 --- a/toonz/sources/toonz/columncommand.cpp +++ b/toonz/sources/toonz/columncommand.cpp @@ -1209,7 +1209,7 @@ void ColumnCmd::clearCells(int index) { // - If onlyColumns is true, it means that only columns with specified indices // will be removed. // - If onlyColumns is false, it means that the relevant pegbars will be removed -// as well (when collapsing collumns). +// as well (when collapsing columns). // - Note that relevant Fxs will be removed / collapsed regardless of // onlyColumns. // - When checkInvert is true, check references both side from the main xsheet diff --git a/toonz/sources/toonz/comboviewerpane.cpp b/toonz/sources/toonz/comboviewerpane.cpp index 010ac4d..c342707 100644 --- a/toonz/sources/toonz/comboviewerpane.cpp +++ b/toonz/sources/toonz/comboviewerpane.cpp @@ -109,7 +109,7 @@ ComboViewerPanel::ComboViewerPanel(QWidget *parent, Qt::WFlags flags) // This code should be removed after updating Qt. // Qt may crash in handling WM_SIZE of m_sceneViewer in splash.finish(&w) // in main.cpp. To suppress sending WM_SIZE, set window position here. - // WM_SIZE will not be sent if window poistion is not changed. + // WM_SIZE will not be sent if window position is not changed. ::SetWindowPos(reinterpret_cast(m_sceneViewer->winId()), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); #endif diff --git a/toonz/sources/toonz/convertpopup.cpp b/toonz/sources/toonz/convertpopup.cpp index 659843e..c6c32dc 100644 --- a/toonz/sources/toonz/convertpopup.cpp +++ b/toonz/sources/toonz/convertpopup.cpp @@ -117,7 +117,7 @@ void ConvertPopup::Converter::run() { TFilePath sourceLevelPath = sc->decodeFilePath(m_parent->m_srcFilePaths[i]); QString levelName = QString::fromStdString(sourceLevelPath.getLevelName()); - // check already exsistent levels + // check already existent levels TFilePath dstFilePath = m_parent->getDestinationFilePath(m_parent->m_srcFilePaths[i]); diff --git a/toonz/sources/toonz/convertpopup.h b/toonz/sources/toonz/convertpopup.h index ef71ec9..d61a73f 100644 --- a/toonz/sources/toonz/convertpopup.h +++ b/toonz/sources/toonz/convertpopup.h @@ -49,7 +49,7 @@ class FrameTaskNotifier; //***************************************************************************** /*! - \brief Window class used in the convertion of levels between different + \brief Window class used in the conversion of levels between different file formats. */ @@ -77,7 +77,7 @@ public: public slots: - void apply(); //!< Starts the convertion. + void apply(); //!< Starts the conversion. void onOptionsClicked(); void onConvertFinished(); void onTlvModeSelected(const QString &tlvMode); diff --git a/toonz/sources/toonz/drawingdata.cpp b/toonz/sources/toonz/drawingdata.cpp index b009b50..5698eb9 100644 --- a/toonz/sources/toonz/drawingdata.cpp +++ b/toonz/sources/toonz/drawingdata.cpp @@ -441,7 +441,7 @@ void DrawingData::getFrames(std::set &frames) const { //----------------------------------------------------------------------------- DrawingData::~DrawingData() { - // cannot do that here! if you have cloned this class, the images in the cahce + // cannot do that here! if you have cloned this class, the images in the cache // are still used... // int i; // for(i=0; iin its entirety. + \return Whether the level was successfully exported in its entirety. User cancels are reported as failures, even if a part of the level has been successfully exported. diff --git a/toonz/sources/toonz/expressionreferencemanager.cpp b/toonz/sources/toonz/expressionreferencemanager.cpp index 3b4a31d..a43aed3 100644 --- a/toonz/sources/toonz/expressionreferencemanager.cpp +++ b/toonz/sources/toonz/expressionreferencemanager.cpp @@ -772,7 +772,7 @@ void ExpressionReferenceManager::transferReference( // 1. create 3 tables for replacing; column indices, parameter pointers, and // expression texts. Note that moving columns in the same xsheet does not need - // to replace the paramter pointers since they are swapped along with columns. + // to replace the parameter pointers since they are swapped along with columns. QMap colIdReplaceTable; QMap curveReplaceTable; std::map exprReplaceTable; @@ -796,7 +796,7 @@ void ExpressionReferenceManager::transferReference( exprReplaceTable[getPhrase(fromId, ph)] = getPhrase(toId, ph); } if (sameXSheet) { - // the paramter pointers are already swapped when moving columns in the + // the parameter pointers are already swapped when moving columns in the // same xsheet curveReplaceTable will be used just for parameter list to // be modified TStageObject* toObj = @@ -971,7 +971,7 @@ void ExpressionReferenceManager::transferReference( } //---------------------------------------------------------------------------- -// open warning popup if there is any paramters which is ignored (i.e. the +// open warning popup if there is any parameters which is ignored (i.e. the // reference is lost and user hasn't touch yet) bool ExpressionReferenceManager::askIfParamIsIgnoredOnSave(bool saveSubXsheet) { // return if the preference option is off diff --git a/toonz/sources/toonz/filebrowser.cpp b/toonz/sources/toonz/filebrowser.cpp index 4fdd0c7..6ac745f 100644 --- a/toonz/sources/toonz/filebrowser.cpp +++ b/toonz/sources/toonz/filebrowser.cpp @@ -705,7 +705,7 @@ void FileBrowser::setFolder(const TFilePath &fp, bool expandNode, } //----------------------------------------------------------------------------- -/*! process when inputting the folder which is not regitered in the folder tree +/*! process when inputting the folder which is not registered in the folder tree (e.g. UNC path in Windows) */ void FileBrowser::setUnregisteredFolder(const TFilePath &fp) { @@ -909,7 +909,7 @@ QVariant FileBrowser::getItemData(int index, DataType dataType, if (index < 0 || index >= (int)m_items.size()) return QVariant(); Item &item = m_items[index]; if (dataType == Name) { - // show two dots( ".." ) for the paret directory item + // show two dots( ".." ) for the parent directory item if (item.m_path == m_folder.getParentDir()) return QString(".."); else @@ -2076,7 +2076,7 @@ void FileBrowser::onSelectedItems(const std::set &indexes) { } // reuse the list of TFrameId in order to skip loadInfo() when loading the - // level with sequencial frames. + // level with sequential frames. emit filePathsSelected(filePaths, frameIDs); } diff --git a/toonz/sources/toonz/filebrowser.h b/toonz/sources/toonz/filebrowser.h index bace081..b78eefe 100644 --- a/toonz/sources/toonz/filebrowser.h +++ b/toonz/sources/toonz/filebrowser.h @@ -100,7 +100,7 @@ types to be displayed in the file browser. void setFolder(const TFilePath &fp, bool expandNode = false, bool forceUpdate = false); - // process when inputting the folder which is not regitered in the folder tree + // process when inputting the folder which is not registered in the folder tree // (e.g. UNC path in Windows) void setUnregisteredFolder(const TFilePath &fp); @@ -209,7 +209,7 @@ signals: void filePathClicked(const TFilePath &); void filePathDoubleClicked(const TFilePath &); // reuse the list of TFrameId in order to skip loadInfo() when loading the - // level with sequencial frames. + // level with sequential frames. void filePathsSelected(const std::set &, const std::list> &); void treeFolderChanged(const TFilePath &); @@ -231,7 +231,7 @@ private: bool m_isFolder; bool m_isLink; - // calling loadInfo to the level with sequencial frames is time consuming. + // calling loadInfo to the level with sequential frames is time consuming. // so keep the list of frameIds at the first time and try to reuse it. std::vector m_frameIds; @@ -291,7 +291,7 @@ private: // TPropertyGroup* getFormatProperties(const std::string &ext); public slots: - //! Starts the convertion. + //! Starts the conversion. // void onConvert(); // void onOptionsClicked(); void onOk(); diff --git a/toonz/sources/toonz/filebrowsermodel.cpp b/toonz/sources/toonz/filebrowsermodel.cpp index 0031d55..e719b1a 100644 --- a/toonz/sources/toonz/filebrowsermodel.cpp +++ b/toonz/sources/toonz/filebrowsermodel.cpp @@ -216,7 +216,7 @@ DvDirModelNode *DvDirModelFileFolderNode::makeChild(std::wstring name) { DvDirModelFileFolderNode *DvDirModelFileFolderNode::createNode( DvDirModelNode *parent, const TFilePath &path) { DvDirModelFileFolderNode *node; - // check the project nodes under the Poject Root Node + // check the project nodes under the Project Root Node if (QString::fromStdWString(parent->getName()).startsWith("Project root") && TProjectManager::instance()->isProject(path)) node = new DvDirModelProjectNode(parent, path); @@ -489,7 +489,7 @@ void DvDirVersionControlNode::getChildrenNames( //----------------------------------------------------------------------------- void DvDirVersionControlNode::setIsUnderVersionControl(bool value) { - // Set the flags and enable/disable renaming accordling + // Set the flags and enable/disable renaming accordingly m_isUnderVersionControl = value; enableRename(!value); } diff --git a/toonz/sources/toonz/filebrowserpopup.cpp b/toonz/sources/toonz/filebrowserpopup.cpp index 2684958..d474ab1 100644 --- a/toonz/sources/toonz/filebrowserpopup.cpp +++ b/toonz/sources/toonz/filebrowserpopup.cpp @@ -756,7 +756,7 @@ LoadLevelPopup::LoadLevelPopup() LevelOptions options; setLevelProperties(options); - //"FILE DOES NOT EXIST" lavel + //"FILE DOES NOT EXIST" label m_notExistLabel->setObjectName("FileDoesNotExistLabel"); m_notExistLabel->hide(); @@ -966,7 +966,7 @@ void LoadLevelPopup::onNameSetEditted() { //----------------------------------------------------------------------- void LoadLevelPopup::updatePosTo() { - // calcurate how mane frames to be occupied in the xsheet + // calculate how many frames to be occupied in the xsheet TFilePath fp = getCurrentPath(); if (QString::fromStdString(fp.getType()) == "tpl") { @@ -1007,7 +1007,7 @@ void LoadLevelPopup::updatePosTo() { frameLength = xTo - xFrom + 1; } else { std::vector fIds = getCurrentFIds(); - //--- If loading the level with sequencial files, reuse the list of + //--- If loading the level with sequential files, reuse the list of // TFrameId if (fIds.size() != 0) { if (m_stepCombo->currentIndex() == 0) // Step = Auto @@ -1176,7 +1176,7 @@ bool LoadLevelPopup::execute() { std::vector fIds = getCurrentFIds(); TFrameId firstFrame; TFrameId lastFrame; - // if the level is sequencial and there is a reusable list of TFrameId + // if the level is sequential and there is a reusable list of TFrameId if (fIds.size() != 0) { firstFrame = fIds[0]; lastFrame = fIds[fIds.size() - 1]; @@ -2089,7 +2089,7 @@ bool ReplaceParentDirectoryPopup::execute() { } } } else { - // calcurate scene length + // calculate scene length int frameLength = xsh->getFrameCount(); std::set::iterator i = m_columnRange.begin(); while (i != m_columnRange.end()) { diff --git a/toonz/sources/toonz/filebrowserpopup.h b/toonz/sources/toonz/filebrowserpopup.h index 0e2289a..0d39271 100644 --- a/toonz/sources/toonz/filebrowserpopup.h +++ b/toonz/sources/toonz/filebrowserpopup.h @@ -89,7 +89,7 @@ protected: std::set m_selectedPaths; //!< Paths in the active selection. TFilePath m_currentProjectPath; //!< Path of current project. //! \deprecated Should not be cached... - // keep TFrameId list in order to speed up the loading of sequencial files + // keep TFrameId list in order to speed up the loading of sequential files std::list> m_currentFIdsSet; FileBrowser *m_browser; @@ -322,7 +322,7 @@ protected slots: void onWhiteTranspClicked(); private: - // update the fields acording to the current Path + // update the fields according to the current Path void updateBottomGUI(void); // if some option in the preferences is selected, load the level with removing // six letters of the scene name from the level name diff --git a/toonz/sources/toonz/fileselection.cpp b/toonz/sources/toonz/fileselection.cpp index 81fc2f0..7e1973c 100644 --- a/toonz/sources/toonz/fileselection.cpp +++ b/toonz/sources/toonz/fileselection.cpp @@ -392,7 +392,7 @@ void FileSelection::convertFiles() { static ConvertPopup *popup = new ConvertPopup(false); if (popup->isConverting()) { DVGui::info(QObject::tr( - "A convertion task is in progress! wait until it stops or cancel it")); + "A conversion task is in progress! wait until it stops or cancel it")); return; } popup->setFiles(files); diff --git a/toonz/sources/toonz/filmstrip.cpp b/toonz/sources/toonz/filmstrip.cpp index 5fc9009..9cd6b7a 100644 --- a/toonz/sources/toonz/filmstrip.cpp +++ b/toonz/sources/toonz/filmstrip.cpp @@ -702,11 +702,11 @@ void FilmstripFrames::paintEvent(QPaintEvent *evt) { fid.getNumber() == TFrameId::NO_FRAME) { text = QString("Single Frame"); } - // for sequencial frame (with letter) + // for sequential frame (with letter) else if (Preferences::instance()->isShowFrameNumberWithLettersEnabled()) { text = fidToFrameNumberWithLetter(fid.getNumber()); } - // for sequencial frame + // for sequential frame else { char letter = fid.getLetter(); text = QString::number(fid.getNumber()).rightJustified(4, '0') + diff --git a/toonz/sources/toonz/filmstrip.h b/toonz/sources/toonz/filmstrip.h index 57a4416..64c60d1 100644 --- a/toonz/sources/toonz/filmstrip.h +++ b/toonz/sources/toonz/filmstrip.h @@ -105,7 +105,7 @@ public: // lo scroll e' illimitato verso il basso. aggiorna contentHeight void scroll(int dy); - // overriden from TSelection::View + // overridden from TSelection::View void onSelectionChanged() override { update(); } enum SelectionMode { diff --git a/toonz/sources/toonz/filmstripcommand.cpp b/toonz/sources/toonz/filmstripcommand.cpp index d1ddc76..ee607c4 100644 --- a/toonz/sources/toonz/filmstripcommand.cpp +++ b/toonz/sources/toonz/filmstripcommand.cpp @@ -1514,7 +1514,7 @@ void FilmstripCmd::paste(TXshSimpleLevel *sl, std::set &frames) { if (drawingData) { if (sl->isSubsequence()) return; - // keep the choosed option of "Keep Original Palette" and reproduce it in + // keep the chosen option of "Keep Original Palette" and reproduce it in // undo bool keepOriginalPalette; diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cpp index eeaaf0f..a668a7e 100644 --- a/toonz/sources/toonz/flipbook.cpp +++ b/toonz/sources/toonz/flipbook.cpp @@ -1413,7 +1413,7 @@ void FlipBook::freezePreview() { m_freezed = true; - // sync the button state when triggered by shotcut + // sync the button state when triggered by shortcut if (m_freezeButton) m_freezeButton->setPressed(true); } @@ -1426,7 +1426,7 @@ void FlipBook::unfreezePreview() { m_freezed = false; - // sync the button state when triggered by shotcut + // sync the button state when triggered by shortcut if (m_freezeButton) m_freezeButton->setPressed(false); } @@ -2218,7 +2218,7 @@ void FlipBook::loadAndCacheAllTlvImages(Level level, int fromFrame, FlipBook *viewFile(const TFilePath &path, int from, int to, int step, int shrink, TSoundTrack *snd, FlipBook *flipbook, bool append, bool isToonzOutput) { - // In case the step and shrink informations are invalid, load them from + // In case the step and shrink information is invalid, load them from // preferences if (step == -1 || shrink == -1) { int _step = 1, _shrink = 1; diff --git a/toonz/sources/toonz/frameheadgadget.h b/toonz/sources/toonz/frameheadgadget.h index a1c31c3..7203ea1 100644 --- a/toonz/sources/toonz/frameheadgadget.h +++ b/toonz/sources/toonz/frameheadgadget.h @@ -42,7 +42,7 @@ public: void drawPlayingHead(QPainter &p, const QColor &lightColor, const QColor &darkColor); - // reimpremented in FilmstripFrameHeadGadget + // reimplemented in FilmstripFrameHeadGadget virtual void drawOnionSkinSelection(QPainter &p, const QColor &lightColor, const QColor &darkColor); @@ -61,7 +61,7 @@ public: void setFos(int frame, bool on); void setMos(int frame, bool on); - // reimpremented in FilmstripFrameHeadGadget + // reimplemented in FilmstripFrameHeadGadget bool eventFilter(QObject *obj, QEvent *event) override; }; diff --git a/toonz/sources/toonz/imageviewer.cpp b/toonz/sources/toonz/imageviewer.cpp index 85f3902..ecbf2cd 100644 --- a/toonz/sources/toonz/imageviewer.cpp +++ b/toonz/sources/toonz/imageviewer.cpp @@ -204,7 +204,7 @@ public: Return current image viewer. */ /*! \fn TAffine ImageViewer::getViewAff() - Return current viewer matrix trasformation. + Return current viewer matrix transformation. */ ImageViewer::ImageViewer(QWidget *parent, FlipBook *flipbook, @@ -632,7 +632,7 @@ void ImageViewer::paintGL() { } //------------------------------------------------------------------------------ -/*! Add to current trasformation matrix a \b delta traslation. +/*! Add to current transformation matrix a \b delta traslation. */ void ImageViewer::panQt(const QPoint &delta) { if (delta == QPoint()) return; @@ -664,7 +664,7 @@ void ImageViewer::panQt(const QPoint &delta) { } //----------------------------------------------------------------------------- -/*! Add to current trasformation matrix a \b center traslation matched with a +/*! Add to current transformation matrix a \b center traslation matched with a scale of factor \b factor. Apply a zoom of factor \b factor with center \b center. @@ -955,7 +955,7 @@ void ImageViewer::pickColor(QMouseEvent *event, bool putValueToStyleEditor) { TPixel32 pix; if (m_lutCalibrator && m_lutCalibrator->isValid()) { - // for specifiying pixel range on picking vector + // for specifying pixel range on picking vector double scale2 = getViewAff().det(); pix = picker.pickColor(pos + TPointD(-0.5, -0.5), 10.0, scale2); } else @@ -1248,7 +1248,7 @@ void ImageViewer::fitView() { } //----------------------------------------------------------------------------- -/*! Update image viewer, reset current matrix trasformation, current position +/*! Update image viewer, reset current matrix transformation, current position and update view. */ void ImageViewer::updateImageViewer() { diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp index 8ee14b1..b3d5c82 100644 --- a/toonz/sources/toonz/iocommand.cpp +++ b/toonz/sources/toonz/iocommand.cpp @@ -1850,7 +1850,7 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile, if (TSystem::doesExistFileOrLevel(scenePathTemp)) { QString question = QObject::tr( - "A prior save of Scene '%1' was critically interupted. \n\ + "A prior save of Scene '%1' was critically interrupted. \n\ \nA partial save file was generated and changes may be manually salvaged from '%2'.\n\ \nDo you wish to continue loading the last good save or stop and try to salvage the prior save?") .arg(QString::fromStdWString(scenePath.getWideString())) diff --git a/toonz/sources/toonz/levelsettingspopup.cpp b/toonz/sources/toonz/levelsettingspopup.cpp index 7641588..8fec99c 100644 --- a/toonz/sources/toonz/levelsettingspopup.cpp +++ b/toonz/sources/toonz/levelsettingspopup.cpp @@ -1137,7 +1137,7 @@ void LevelSettingsPopup::onScanPathChanged() { QString text = m_scanPathFld->getPath(); TFilePath newScanPath(text.toStdWString()); - // limit the avaiable formats for now + // limit the available formats for now if (newScanPath.getType() != "tif" && newScanPath.getType() != "tiff" && newScanPath.getType() != "tzi") { m_scanPathFld->setPath(toQString(sl->getScannedPath())); diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index 7295bd6..d618fb0 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -365,7 +365,7 @@ int main(int argc, char *argv[]) { a.setAttribute(Qt::AA_UseDesktopOpenGL, true); #endif - // Some Qt objects are destroyed badly withouth a living qApp. So, we must + // Some Qt objects are destroyed badly without a living qApp. So, we must // enforce a way to either // postpone the application destruction until the very end, OR ensure that // sensible objects are @@ -417,7 +417,7 @@ int main(int argc, char *argv[]) { // Set the app's locale for numeric stuff to standard C. This is important for // atof() and similar - // calls that are locale-dependant. + // calls that are locale-dependent. setlocale(LC_NUMERIC, "C"); // Set current directory to the bundle/application path - this is needed to have diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 98de708..00e4e1d 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1602,8 +1602,8 @@ QAction *MainWindow::createToolAction(const char *id, const char *iconName, action->setCheckable(true); action->setActionGroup(m_toolsActionGroup); - // When the viewer is maximized (not fullscreen) the toolbar is hided and the - // action are disabled, + // When the viewer is maximized (not fullscreen) the toolbar is hidden and the + // actions are disabled, // so the tool shortcuts don't work. // Adding tool actions to the main window solve this problem! addAction(action); @@ -2735,7 +2735,7 @@ void MainWindow::defineActions() { // Following actions are for adding "Visualization" menu items to the command // bar. They are separated from the original actions in order to avoid // assigning shortcut keys. They must be triggered only from pressing buttons - // in the command bar. Assinging shortcut keys and registering as MenuItem + // in the command bar. Assigning shortcut keys and registering as MenuItem // will break a logic of ShortcutZoomer. So here we register separate items // and bypass the command. createVisualizationButtonAction(VB_ViewReset, QT_TR_NOOP("Reset View"), diff --git a/toonz/sources/toonz/meshifypopup.cpp b/toonz/sources/toonz/meshifypopup.cpp index 9f335c2..90bb8a1 100644 --- a/toonz/sources/toonz/meshifypopup.cpp +++ b/toonz/sources/toonz/meshifypopup.cpp @@ -537,7 +537,7 @@ public: } else if (m_xsh) { // Build reference change affines - // EXPLANATION: RasterPainter receives an affine specifiying the reference + // EXPLANATION: RasterPainter receives an affine specifying the reference // change // from world coordinates to the OpenGL viewport, where (0,0) corresponds // to the @@ -867,7 +867,7 @@ TMeshImageP meshify(const TXshCell &cell, const MeshifyOptions &options) { slDpi = sl->getDpi(); locals::checkEmptyDpi(slDpi); - // Due to a Toonz bug when loading a PLI, slDpi may actually aquire the + // Due to a Toonz bug when loading a PLI, slDpi may actually acquire the // camera dpi - // but it's always shown to be at the STANDARD world DPI, Stage::inch - // plus, the diff --git a/toonz/sources/toonz/meshifypopup.h b/toonz/sources/toonz/meshifypopup.h index 0c1388a..c0469ef 100644 --- a/toonz/sources/toonz/meshifypopup.h +++ b/toonz/sources/toonz/meshifypopup.h @@ -62,7 +62,7 @@ private: class Swatch; private: - // GUI memebers + // GUI members DVGui::MeasuredDoubleField *m_edgesLength; //!< Target length of mesh edges. DVGui::DoubleLineEdit diff --git a/toonz/sources/toonz/outputsettingspopup.cpp b/toonz/sources/toonz/outputsettingspopup.cpp index eeb7bc8..03841b6 100644 --- a/toonz/sources/toonz/outputsettingspopup.cpp +++ b/toonz/sources/toonz/outputsettingspopup.cpp @@ -643,7 +643,7 @@ QFrame *OutputSettingsPopup::createMoreSettingsBox() { lay->addWidget(m_frameRateFld, 3, 1, Qt::AlignLeft | Qt::AlignVCenter); lay->addWidget(new QLabel(tr("(linked to Scene Settings)"), this), 3, 2, 1, 2, Qt::AlignLeft | Qt::AlignVCenter); - // Strech + // Stretch lay->addWidget(new QLabel(tr("Stretch from FPS:"), this), 4, 0, Qt::AlignRight | Qt::AlignVCenter); lay->addWidget(m_stretchFromFld, 4, 1, Qt::AlignLeft | Qt::AlignVCenter); diff --git a/toonz/sources/toonz/pane.cpp b/toonz/sources/toonz/pane.cpp index 93d16e0..013f1fa 100644 --- a/toonz/sources/toonz/pane.cpp +++ b/toonz/sources/toonz/pane.cpp @@ -64,7 +64,7 @@ TPanel::TPanel(QWidget *parent, Qt::WindowFlags flags, //----------------------------------------------------------------------------- TPanel::~TPanel() { - // On quitting, save the floating panel's geomtry and state in order to + // On quitting, save the floating panel's geometry and state in order to // restore them when opening the floating panel next time if (isFloating()) { TFilePath savePath = diff --git a/toonz/sources/toonz/pane.h b/toonz/sources/toonz/pane.h index d1c940b..bbdb0bf 100644 --- a/toonz/sources/toonz/pane.h +++ b/toonz/sources/toonz/pane.h @@ -229,7 +229,7 @@ public: virtual void setViewType(int viewType){}; virtual bool widgetInThisPanelIsFocused() { - // by default, chech if the panel content itself has focus + // by default, check if the panel content itself has focus if (widget()) return widget()->hasFocus(); else diff --git a/toonz/sources/toonz/penciltestpopup.cpp b/toonz/sources/toonz/penciltestpopup.cpp index 53deba3..4b42983 100644 --- a/toonz/sources/toonz/penciltestpopup.cpp +++ b/toonz/sources/toonz/penciltestpopup.cpp @@ -829,7 +829,7 @@ PencilTestSaveInFolderPopup::PencilTestSaveInFolderPopup(QWidget* parent) QFrame* subFolderFrame = new QFrame(this); - QGroupBox* infoGroupBox = new QGroupBox(tr("Infomation"), this); + QGroupBox* infoGroupBox = new QGroupBox(tr("Information"), this); QGroupBox* subNameGroupBox = new QGroupBox(tr("Subfolder Name"), this); m_projectField = new QLineEdit(this); @@ -1843,8 +1843,8 @@ void PencilTestPopup::onPreviousName() { std::wstring levelName; - // if the current level name is non-sequencial, then try to switch the last - // sequencial level in the scene. + // if the current level name is non-sequential, then try to switch the last + // sequential level in the scene. if (!nameCreator->setCurrent(m_levelNameEdit->text().toStdWString())) { TLevelSet* levelSet = TApp::instance()->getCurrentScene()->getScene()->getLevelSet(); diff --git a/toonz/sources/toonz/penciltestpopup_qt.cpp b/toonz/sources/toonz/penciltestpopup_qt.cpp index 97a0c33..3b5818f 100644 --- a/toonz/sources/toonz/penciltestpopup_qt.cpp +++ b/toonz/sources/toonz/penciltestpopup_qt.cpp @@ -1033,7 +1033,7 @@ PencilTestSaveInFolderPopup::PencilTestSaveInFolderPopup(QWidget* parent) QFrame* subFolderFrame = new QFrame(this); - QGroupBox* infoGroupBox = new QGroupBox(tr("Infomation"), this); + QGroupBox* infoGroupBox = new QGroupBox(tr("Information"), this); QGroupBox* subNameGroupBox = new QGroupBox(tr("Subfolder Name"), this); m_projectField = new QLineEdit(this); @@ -2032,8 +2032,8 @@ void PencilTestPopup::onPreviousName() { std::wstring levelName; - // if the current level name is non-sequencial, then try to switch the last - // sequencial level in the scene. + // if the current level name is non-sequential, then try to switch the last + // sequential level in the scene. if (!nameCreator->setCurrent(m_levelNameEdit->text().toStdWString())) { TLevelSet* levelSet = TApp::instance()->getCurrentScene()->getScene()->getLevelSet(); diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp index 0410e20..e34fbfa 100644 --- a/toonz/sources/toonz/preferencespopup.cpp +++ b/toonz/sources/toonz/preferencespopup.cpp @@ -1302,7 +1302,7 @@ inline T PreferencesPopup::getUI(PreferencesItemId id) { } //********************************************************************************** -// PrefencesPopup's constructor +// PreferencesPopup's constructor //********************************************************************************** PreferencesPopup::PreferencesPopup() diff --git a/toonz/sources/toonz/previewer.cpp b/toonz/sources/toonz/previewer.cpp index 797caa7..8dbafd8 100644 --- a/toonz/sources/toonz/previewer.cpp +++ b/toonz/sources/toonz/previewer.cpp @@ -76,13 +76,13 @@ The most important method of the class is \b getRaster(), which attempts retrieval of a certain frame and, if the frame was not calculated yet, makes the Previewer build it. \n -The update() slot is provided to refresh the cached informations about the +The update() slot is provided to refresh the cached information about the entire collection of currently stored frames. Updated frames are recalculated only upon a new getRaster(), in case the previously -stored informations no more match the current frame description. +stored information no more match the current frame description. \n -The clear() methods make the Previewer erase all stored informations about one +The clear() methods make the Previewer erase all stored information about one or all frames, so that the following getRaster() will forcibly recalculate the requested frame. */ @@ -618,7 +618,7 @@ inline void Previewer::Imp::notifyUpdate() { //----------------------------------------------------------------------------- -//! Adds the renderized image to TImageCache; listeneres are advised too. +//! Adds the renderized image to TImageCache; listeners are advised too. void Previewer::Imp::onRenderRasterStarted(const RenderData &renderData) { // Emit the started signal to execute code in the main thread m_owner->emitStartedFrame(renderData); @@ -640,7 +640,7 @@ void Previewer::Imp::doOnRenderRasterStarted(const RenderData &renderData) { //----------------------------------------------------------------------------- -//! Adds the renderized image to TImageCache; listeneres are advised too. +//! Adds the renderized image to TImageCache; listeners are advised too. void Previewer::Imp::onRenderRasterCompleted(const RenderData &renderData) { if (renderData.m_rasB) { RenderData _renderData = renderData; @@ -734,7 +734,7 @@ void Previewer::Imp::onRenderFailure(const RenderData &renderData, //----------------------------------------------------------------------------- -//! Adds the renderized image to TImageCache; listeneres are advised too. +//! Adds the renderized image to TImageCache; listeners are advised too. void Previewer::Imp::doOnRenderRasterFailed(const RenderData &renderData) { m_computingFrameCount--; diff --git a/toonz/sources/toonz/previewfxmanager.cpp b/toonz/sources/toonz/previewfxmanager.cpp index b37a4f3..99c1b3c 100644 --- a/toonz/sources/toonz/previewfxmanager.cpp +++ b/toonz/sources/toonz/previewfxmanager.cpp @@ -41,7 +41,7 @@ // Qt stuff #include #include -#include "toonzqt/gutil.h" //For converions between TRects and QRects +#include "toonzqt/gutil.h" //For conversions between TRects and QRects // Preferences #include "toonz/preferences.h" @@ -379,9 +379,9 @@ PreviewFxInstance::~PreviewFxInstance() { //----------------------------------------------------------------------------------------- -//! Clears the preview instance informations about passed frame, including any +//! Clears the preview instance information about passed frame, including any //! cached image. -//! Informations needed to preview again are NOT rebuilt. +//! Information needed to preview again are NOT rebuilt. void PreviewFxInstance::reset(int frame) { TImageCache::instance()->remove(getCacheId(m_fx, frame)); std::map::iterator it = m_frameInfos.find(frame); @@ -396,8 +396,8 @@ void PreviewFxInstance::reset(int frame) { //----------------------------------------------------------------------------------------- -//! Clears the preview instance informations, including cached images. -//! Informations needed +//! Clears the preview instance information, including cached images. +//! Information needed //! to preview again are rebuilt. void PreviewFxInstance::reset() { int i; @@ -633,7 +633,7 @@ void PreviewFxInstance::updateFlipbookTitles() { std::set::iterator kt; for (kt = m_flipbooks.begin(); kt != m_flipbooks.end(); ++kt) { // In the full preview case, the title must display the frame range - // informations + // information (*kt)->setTitle( /*"Rendered Frames :: From " + QString::number(start) + " To " + QString::number(end) + diff --git a/toonz/sources/toonz/previewfxmanager.h b/toonz/sources/toonz/previewfxmanager.h index 5a1f2c1..d66a9ef 100644 --- a/toonz/sources/toonz/previewfxmanager.h +++ b/toonz/sources/toonz/previewfxmanager.h @@ -31,7 +31,7 @@ rendering classes and Flipbooks. \n \n The showNewPreview() method invocation takes place when users activate the 'Preview' command from the -right-click menu of fxs in the schematic. It inizializes a TRenderer object and +right-click menu of fxs in the schematic. It initializes a TRenderer object and starts the render of passed fx over the preview properties range; at the same time, a new Flipbook is opened to diff --git a/toonz/sources/toonz/scanpopup.cpp b/toonz/sources/toonz/scanpopup.cpp index bc40d3a..eff302f 100644 --- a/toonz/sources/toonz/scanpopup.cpp +++ b/toonz/sources/toonz/scanpopup.cpp @@ -538,7 +538,7 @@ AutocenterPopup::AutocenterPopup() : DVGui::Dialog(0, false, true) { settingsLayout->addWidget(m_pegbarHoles, row, 1, Qt::AlignLeft); ++row; - // Feld Guide + // Field Guide settingsLayout->addWidget(new QLabel(tr("Field Guide:")), row, 0, Qt::AlignRight); m_fieldGuide = new QComboBox(this); diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp index 799d42f..ba51332 100644 --- a/toonz/sources/toonz/sceneviewer.cpp +++ b/toonz/sources/toonz/sceneviewer.cpp @@ -1766,7 +1766,7 @@ void SceneViewer::drawOverlay() { // outside the draw() methods: // using special style there was a conflict between the draw() methods of // the tool - // and the genaration of the icon inside the style editor (makeIcon()) which + // and the generation of the icon inside the style editor (makeIcon()) which // use // another glContext if (tool->getName() == "T_RGBPicker") tool->onImageChanged(); @@ -1834,9 +1834,9 @@ void SceneViewer::paintGL() { } #endif #ifdef MACOSX - // followin lines are necessary to solve a problem on iMac20 + // following lines are necessary to solve a problem on iMac20 // It seems that for some errors in the openGl implementation, buffers are not - // set corretly. + // set correctly. if (m_isMouseEntered && m_forceGlFlush) { m_isMouseEntered = false; m_forceGlFlush = false; diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.h index df62cdc..f79fdbb 100644 --- a/toonz/sources/toonz/sceneviewer.h +++ b/toonz/sources/toonz/sceneviewer.h @@ -361,10 +361,10 @@ protected: // center: window coordinate, pixels, topleft origin void zoomQt(const QPoint ¢er, double scaleFactor); - // overriden from TTool::Viewer + // overridden from TTool::Viewer void pan(const TPointD &delta) override { panQt(QPointF(delta.x, delta.y)); } - // overriden from TTool::Viewer + // overridden from TTool::Viewer void zoom(const TPointD ¢er, double factor) override; void rotate(const TPointD ¢er, double angle) override; void rotate3D(double dPhi, double dTheta) override; diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp index b0fae98..05d3ee4 100644 --- a/toonz/sources/toonz/sceneviewerevents.cpp +++ b/toonz/sources/toonz/sceneviewerevents.cpp @@ -297,7 +297,7 @@ void SceneViewer::tabletEvent(QTabletEvent *e) { // So, in such case set m_tabletEvent = FALSE and let the mousePressEvent to // work. if (e->button() == Qt::LeftButton) { - // Proces the 1st tabletPress encountered and ignore back-to-back + // Process the 1st tabletPress encountered and ignore back-to-back // tabletPress events. Treat it as if it happened so a following // mousePressEvent gets ignored if (m_tabletState == Released || m_tabletState == None) { diff --git a/toonz/sources/toonz/separatecolorspopup.cpp b/toonz/sources/toonz/separatecolorspopup.cpp index f0963e0..9e8f21f 100644 --- a/toonz/sources/toonz/separatecolorspopup.cpp +++ b/toonz/sources/toonz/separatecolorspopup.cpp @@ -1261,7 +1261,7 @@ void SeparateColorsPopup::doCompute(TRaster32P raster, TDimensionI& dim, matte_host = (uchar3*)matte_host_ras->getRawData(); } - // input the souce image + // input the source image QVector3D* chann_p = src_host; for (int j = 0; j < dim.ly; j++) { TPixel32* pix = raster->pixels(j); @@ -1447,7 +1447,7 @@ void SeparateColorsPopup::doCompute(TRaster32P raster, TDimensionI& dim, matte_host = (uchar4*)matte_host_ras->getRawData(); } - // input the souce image + // input the source image QVector3D* chann_p = src_host; for (int j = 0; j < dim.ly; j++) { TPixel32* pix = raster->pixels(j); diff --git a/toonz/sources/toonz/separatecolorspopup.h b/toonz/sources/toonz/separatecolorspopup.h index f2974f5..497a537 100644 --- a/toonz/sources/toonz/separatecolorspopup.h +++ b/toonz/sources/toonz/separatecolorspopup.h @@ -174,7 +174,7 @@ protected: void hideEvent(QHideEvent* e); public slots: - // starts the convertion + // starts the conversion void separate(); void onSeparateFinished(); void onPreviewBtnPressed(); diff --git a/toonz/sources/toonz/studiopaletteviewer.cpp b/toonz/sources/toonz/studiopaletteviewer.cpp index c7ca775..35f42e5 100644 --- a/toonz/sources/toonz/studiopaletteviewer.cpp +++ b/toonz/sources/toonz/studiopaletteviewer.cpp @@ -90,13 +90,13 @@ bool isInStudioPalette(TFilePath path) { the three root folder of \b StudioPalette. */ /*! \fn void StudioPaletteTreeViewer::onStudioPaletteTreeChange() - Overriden from StudioPalette::Listener. + Overridden from StudioPalette::Listener. \fn void StudioPaletteTreeViewer::onStudioPaletteMove(const TFilePath &dstPath, const TFilePath &srcPath) - Overriden from StudioPalette::Listener. + Overridden from StudioPalette::Listener. \fn void StudioPaletteTreeViewer::onStudioPaletteChange(const TFilePath &palette) - Overriden from StudioPalette::Listener. + Overridden from StudioPalette::Listener. */ StudioPaletteTreeViewer::StudioPaletteTreeViewer( QWidget *parent, TPaletteHandle *studioPaletteHandle, @@ -198,7 +198,7 @@ QTreeWidgetItem *StudioPaletteTreeViewer::createRootItem(TFilePath path, } //----------------------------------------------------------------------------- -/*! Return true if \b item is a root item; false otherwis. +/*! Return true if \b item is a root item; false otherwise. */ bool StudioPaletteTreeViewer::isRootItem(QTreeWidgetItem *item) { assert(item); diff --git a/toonz/sources/toonz/studiopaletteviewer.h b/toonz/sources/toonz/studiopaletteviewer.h index 2dc7c2d..aad1a29 100644 --- a/toonz/sources/toonz/studiopaletteviewer.h +++ b/toonz/sources/toonz/studiopaletteviewer.h @@ -49,7 +49,7 @@ public: void setLevelHandle(TXshLevelHandle *levelHandle); TXshLevelHandle *getLevelHandle() const { return m_levelHandle; } - // Overriden from StudioPalette::Listener + // Overridden from StudioPalette::Listener void onStudioPaletteTreeChange() { refresh(); } void onStudioPaletteMove(const TFilePath &dstPath, const TFilePath &srcPath) { refresh(); diff --git a/toonz/sources/toonz/subscenecommand.cpp b/toonz/sources/toonz/subscenecommand.cpp index df6e55b..2726d89 100644 --- a/toonz/sources/toonz/subscenecommand.cpp +++ b/toonz/sources/toonz/subscenecommand.cpp @@ -695,7 +695,7 @@ std::set explodeStageObjects( objGroupData, groupId); } - // add colums; + // add columns; FxDag *innerDag = subXsh->getFxDag(); FxDag *outerDag = xsh->getFxDag(); TStageObjectId tmpParentId = parentId; @@ -2490,13 +2490,13 @@ void SubsceneCmd::explode(int index) { childLevel->getXsheet(), index, removeColumn, ret == 2)) return; - // Collect column stage object informations + // Collect column stage object information TStageObjectId colId = TStageObjectId::ColumnId(index); TStageObjectId parentId = xsh->getStageObjectParent(colId); TStageObject *obj = xsh->getStageObjectTree()->getStageObject(colId, false); assert(obj); - // Collect StageObjects group informations + // Collect StageObjects group information QStack objGroupIds; QStack objGroupNames; int objEditingGroup = obj->getEditingGroupId(); @@ -2520,7 +2520,7 @@ void SubsceneCmd::explode(int index) { TFx *columnFx = column->getFx(); TFxAttributes *attr = columnFx->getAttributes(); - // Collect Fx group informations + // Collect Fx group information QStack fxGroupIds; QStack fxGroupNames; int fxEditingGroup = attr->getEditingGroupId(); diff --git a/toonz/sources/toonz/svncleanupdialog.cpp b/toonz/sources/toonz/svncleanupdialog.cpp index b39f7b3..044ab0e 100644 --- a/toonz/sources/toonz/svncleanupdialog.cpp +++ b/toonz/sources/toonz/svncleanupdialog.cpp @@ -45,7 +45,7 @@ SVNCleanupDialog::SVNCleanupDialog(QWidget *parent, const QString &workingDir) addButtonBarWidget(m_closeButton); - // 0. Connect for svn errors (that may occurs everythings) + // 0. Connect for svn errors (that may occur every time) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); diff --git a/toonz/sources/toonz/svncommitdialog.cpp b/toonz/sources/toonz/svncommitdialog.cpp index 9d7cb85..8148191 100644 --- a/toonz/sources/toonz/svncommitdialog.cpp +++ b/toonz/sources/toonz/svncommitdialog.cpp @@ -167,7 +167,7 @@ SVNCommitDialog::SVNCommitDialog(QWidget *parent, const QString &workingDir, addButtonBarWidget(m_commitButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs everythings) + // 0. Connect for svn errors (that may occur every time) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); @@ -994,7 +994,7 @@ SVNCommitFrameRangeDialog::SVNCommitFrameRangeDialog(QWidget *parent, addButtonBarWidget(m_commitButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs) + // 0. Connect for svn errors (that may occur) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); } diff --git a/toonz/sources/toonz/svndeletedialog.cpp b/toonz/sources/toonz/svndeletedialog.cpp index 06f04f0..7600a5a 100644 --- a/toonz/sources/toonz/svndeletedialog.cpp +++ b/toonz/sources/toonz/svndeletedialog.cpp @@ -161,7 +161,7 @@ SVNDeleteDialog::SVNDeleteDialog(QWidget *parent, const QString &workingDir, addButtonBarWidget(m_deleteLocalButton, m_deleteServerButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs) + // 0. Connect for svn errors (that may occur) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); } diff --git a/toonz/sources/toonz/svnlockdialog.cpp b/toonz/sources/toonz/svnlockdialog.cpp index 3c4f110..02c392c 100644 --- a/toonz/sources/toonz/svnlockdialog.cpp +++ b/toonz/sources/toonz/svnlockdialog.cpp @@ -153,7 +153,7 @@ SVNLockDialog::SVNLockDialog(QWidget *parent, const QString &workingDir, addButtonBarWidget(m_lockButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs everythings) + // 0. Connect for svn errors (that may occur every time) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); diff --git a/toonz/sources/toonz/svnlockframerangedialog.cpp b/toonz/sources/toonz/svnlockframerangedialog.cpp index d9930d0..74a7200 100644 --- a/toonz/sources/toonz/svnlockframerangedialog.cpp +++ b/toonz/sources/toonz/svnlockframerangedialog.cpp @@ -124,7 +124,7 @@ SVNLockFrameRangeDialog::SVNLockFrameRangeDialog(QWidget *parent, addButtonBarWidget(m_lockButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs) + // 0. Connect for svn errors (that may occur) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); @@ -458,7 +458,7 @@ SVNLockMultiFrameRangeDialog::SVNLockMultiFrameRangeDialog( addButtonBarWidget(m_lockButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs) + // 0. Connect for svn errors (that may occur) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); @@ -706,7 +706,7 @@ SVNUnlockFrameRangeDialog::SVNUnlockFrameRangeDialog(QWidget *parent, addButtonBarWidget(m_unlockButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs) + // 0. Connect for svn errors (that may occur) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); } @@ -942,7 +942,7 @@ SVNUnlockMultiFrameRangeDialog::SVNUnlockMultiFrameRangeDialog( addButtonBarWidget(m_unlockButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs) + // 0. Connect for svn errors (that may occur) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); @@ -1076,7 +1076,7 @@ SVNFrameRangeLockInfoDialog::SVNFrameRangeLockInfoDialog( addButtonBarWidget(closeButton); - // 0. Connect for svn errors (that may occurs) + // 0. Connect for svn errors (that may occur) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); @@ -1174,7 +1174,7 @@ SVNMultiFrameRangeLockInfoDialog::SVNMultiFrameRangeLockInfoDialog( addButtonBarWidget(closeButton); - // 0. Connect for svn errors (that may occurs) + // 0. Connect for svn errors (that may occur) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); diff --git a/toonz/sources/toonz/svnpurgedialog.cpp b/toonz/sources/toonz/svnpurgedialog.cpp index f2c50f1..20dfd49 100644 --- a/toonz/sources/toonz/svnpurgedialog.cpp +++ b/toonz/sources/toonz/svnpurgedialog.cpp @@ -60,7 +60,7 @@ SVNPurgeDialog::SVNPurgeDialog(QWidget *parent, const QString &workingDir) addButtonBarWidget(m_purgeButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs everythings) + // 0. Connect for svn errors (that may occur every time) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); diff --git a/toonz/sources/toonz/svnrevertdialog.cpp b/toonz/sources/toonz/svnrevertdialog.cpp index 02a64e5..144c6b8 100644 --- a/toonz/sources/toonz/svnrevertdialog.cpp +++ b/toonz/sources/toonz/svnrevertdialog.cpp @@ -107,7 +107,7 @@ SVNRevertDialog::SVNRevertDialog(QWidget *parent, const QString &workingDir, addButtonBarWidget(m_revertButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs everythings) + // 0. Connect for svn errors (that may occur every time) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); @@ -411,7 +411,7 @@ void SVNRevertFrameRangeDialog::revertFiles() { QStringList list = qDir.entryList(QDir::Files); m_files = list.filter(regExp); - // 0. Connect for svn errors (that may occurs everythings) + // 0. Connect for svn errors (that may occur every time) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); diff --git a/toonz/sources/toonz/svnupdateandlockdialog.cpp b/toonz/sources/toonz/svnupdateandlockdialog.cpp index 2a15fe7..d56af97 100644 --- a/toonz/sources/toonz/svnupdateandlockdialog.cpp +++ b/toonz/sources/toonz/svnupdateandlockdialog.cpp @@ -130,7 +130,7 @@ SVNUpdateAndLockDialog::SVNUpdateAndLockDialog(QWidget *parent, addButtonBarWidget(m_updateAndLockButton, m_lockButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs) + // 0. Connect for svn errors (that may occur) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); diff --git a/toonz/sources/toonz/svnupdatedialog.cpp b/toonz/sources/toonz/svnupdatedialog.cpp index c178773..54c626f 100644 --- a/toonz/sources/toonz/svnupdatedialog.cpp +++ b/toonz/sources/toonz/svnupdatedialog.cpp @@ -131,7 +131,7 @@ SVNUpdateDialog::SVNUpdateDialog(QWidget *parent, const QString &workingDir, addButtonBarWidget(m_updateButton, m_closeButton, m_cancelButton); - // 0. Connect for svn errors (that may occurs everythings) + // 0. Connect for svn errors (that may occur every time) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); diff --git a/toonz/sources/toonz/tapp.cpp b/toonz/sources/toonz/tapp.cpp index 0f6030c..421b2e6 100644 --- a/toonz/sources/toonz/tapp.cpp +++ b/toonz/sources/toonz/tapp.cpp @@ -463,7 +463,7 @@ void TApp::onXsheetSwitched() { // update xsheetlevel updateXshLevel(); - // no Fx is setted to current. + // no Fx is set to current. m_currentFx->setFx(0); } diff --git a/toonz/sources/toonz/trackerpopup.cpp b/toonz/sources/toonz/trackerpopup.cpp index 6173491..a47c071 100644 --- a/toonz/sources/toonz/trackerpopup.cpp +++ b/toonz/sources/toonz/trackerpopup.cpp @@ -594,10 +594,10 @@ bool Tracker::setup() { bool image_background = false; bool occl = m_manageOcclusion; - // costruct trackers + // construct trackers for (i = 0; i < m_trackerCount; i++) { - // costruct + // construct m_pObjectTracker[i] = new CObjectTracker(size.lx, size.ly, image_c, image_background, occl); diff --git a/toonz/sources/toonz/vectorizerpopup.cpp b/toonz/sources/toonz/vectorizerpopup.cpp index 4184de9..37af8eb 100644 --- a/toonz/sources/toonz/vectorizerpopup.cpp +++ b/toonz/sources/toonz/vectorizerpopup.cpp @@ -416,7 +416,7 @@ int Vectorizer::doVectorize() { void Vectorizer::run() { doVectorize(); } //***************************************************************************** -// VectorizerPopup implentation +// VectorizerPopup implementation //***************************************************************************** #if QT_VERSION >= 0x050500 @@ -766,7 +766,7 @@ paramsLayout->addWidget(m_cThicknessRatio, row++, 1);*/ m_swatchArea = new VectorizerSwatchArea(this); splitter->addWidget(m_swatchArea); - m_swatchArea->setEnabled(false); // Initally not enabled + m_swatchArea->setEnabled(false); // Initially not enabled connect(this, SIGNAL(valuesChanged()), m_swatchArea, SLOT(invalidateContents())); @@ -1242,7 +1242,7 @@ void VectorizerPopup::setType(bool outline) { disconnect(m_typeMenu, SIGNAL(currentIndexChanged(int)), this, SLOT(onTypeChange(int))); - // Setting child visibility alot invokes several layout updates - causing + // Setting child visibility a lot invokes several layout updates - causing // extensive flickering m_paramsWidget->layout()->setEnabled(false); diff --git a/toonz/sources/toonz/vectorizerswatch.cpp b/toonz/sources/toonz/vectorizerswatch.cpp index dcdbe44..f7c89f9 100644 --- a/toonz/sources/toonz/vectorizerswatch.cpp +++ b/toonz/sources/toonz/vectorizerswatch.cpp @@ -418,7 +418,7 @@ VectorizerSwatchArea::VectorizerSwatchArea(QWidget *parent) { setMinimumHeight(150); - // The followings help in re-establishing focus for wheel events + // The following help in re-establishing focus for wheel events m_leftSwatch->setFocusPolicy(Qt::WheelFocus); m_rightSwatch->setFocusPolicy(Qt::WheelFocus); } diff --git a/toonz/sources/toonz/versioncontroltimeline.cpp b/toonz/sources/toonz/versioncontroltimeline.cpp index 75dfdf7..07c41b7 100644 --- a/toonz/sources/toonz/versioncontroltimeline.cpp +++ b/toonz/sources/toonz/versioncontroltimeline.cpp @@ -162,7 +162,7 @@ SVNTimeline::SVNTimeline(QWidget *parent, const QString &workingDir, addButtonBarWidget(m_updateButton, m_updateToRevisionButton, m_closeButton); - // 0. Connect for svn errors (that may occurs everythings) + // 0. Connect for svn errors (that may occur every time) connect(&m_thread, SIGNAL(error(const QString &)), this, SLOT(onError(const QString &))); diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cpp index 0375e9c..4a755db 100644 --- a/toonz/sources/toonz/xshcellviewer.cpp +++ b/toonz/sources/toonz/xshcellviewer.cpp @@ -2436,7 +2436,7 @@ void CellArea::drawKeyframe(QPainter &p, const QRect toBeUpdated) { p.drawLine(target + QPoint(5, 2), target + QPoint(8, 2)); } if (pegbar->isCycleEnabled()) { - // the row zigzag bellow the button + // the row zigzag below the button int ymax = m_viewer->rowToFrameAxis(r1 + 1); int qy = icon_frameAxis + 12; int zig = 2; @@ -2904,7 +2904,7 @@ void CellArea::mouseMoveEvent(QMouseEvent *event) { if (pegbar->getKeyframeSpan(row, r0, e0, r1, e1) && getEaseHandles( r0, r1, e0, e1, rh0, - rh1)) { // triangles in the segment betweeen key frames + rh1)) { // triangles in the segment between key frames if (rh0 == row) m_tooltip = tr("Click and drag to set the acceleration range"); else if (rh1 == row) diff --git a/toonz/sources/toonz/xshcolumnviewer.cpp b/toonz/sources/toonz/xshcolumnviewer.cpp index 7fe1c6a..50b4cd1 100644 --- a/toonz/sources/toonz/xshcolumnviewer.cpp +++ b/toonz/sources/toonz/xshcolumnviewer.cpp @@ -1502,7 +1502,7 @@ void ColumnArea::drawSoundColumnHead(QPainter &p, int col) { // AREA drawHeader.drawColumnName(); drawHeader.drawColumnNumber(); // Sound columns don't have an image. Passing in an image - // for arguement, but it will be ignored. + // for argument, but it will be ignored. static QPixmap iconignored; drawHeader.drawThumbnail(iconignored); drawHeader.drawPegbarName(); diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp index fc10bc6..2286cdd 100644 --- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp @@ -31,7 +31,7 @@ using namespace TVER; #include #endif -//#define REDIRECT_OUPUT +//#define REDIRECT_OUTPUT #ifdef _WIN32 #define QUOTE_STR "\"" diff --git a/toonz/sources/toonzfarm/tnzcore_stuff/tsystem.cpp b/toonz/sources/toonzfarm/tnzcore_stuff/tsystem.cpp index 4304ef1..1357439 100644 --- a/toonz/sources/toonzfarm/tnzcore_stuff/tsystem.cpp +++ b/toonz/sources/toonzfarm/tnzcore_stuff/tsystem.cpp @@ -1115,7 +1115,7 @@ ULONG TSystem::getFreeMemorySize() { #ifdef __sgi // check for virtual memory int numberOfResources = - swapctl(SC_GETNSWP, 0); /* get number of swapping resources configued */ + swapctl(SC_GETNSWP, 0); /* get number of swapping resources configured */ if (numberOfResources == 0) return 0; diff --git a/toonz/sources/toonzlib/fxcommand.cpp b/toonz/sources/toonzlib/fxcommand.cpp index 9c16a6b..cb1c8a0 100644 --- a/toonz/sources/toonzlib/fxcommand.cpp +++ b/toonz/sources/toonzlib/fxcommand.cpp @@ -2329,7 +2329,7 @@ static void deleteFxs(const std::list &fxs, TXsheetHandle *xshHandle, std::unique_ptr undo( new DeleteFxOrColumnUndo(*ft, xshHandle, fxHandle)); if (undo->isConsistent()) { - // prevent emiting xsheetChanged signal for every undos which will cause + // prevent emitting xsheetChanged signal for every undos which will cause // multiple triggers of preview rendering undo->m_isLastInRedoBlock = false; undo->redo(); @@ -2382,7 +2382,7 @@ static void deleteColumns(const std::list &columns, std::unique_ptr undo( new DeleteFxOrColumnUndo(cols[c]->getIndex(), xshHandle, fxHandle)); if (undo->isConsistent()) { - // prevent emiting xsheetChanged signal for every undos which will cause + // prevent emitting xsheetChanged signal for every undos which will cause // multiple triggers of preview rendering undo->m_isLastInRedoBlock = false; undo->redo(); diff --git a/toonz/sources/toonzlib/ikjacobian.cpp b/toonz/sources/toonzlib/ikjacobian.cpp index 6151a7a..091801c 100644 --- a/toonz/sources/toonzlib/ikjacobian.cpp +++ b/toonz/sources/toonzlib/ikjacobian.cpp @@ -1552,7 +1552,7 @@ void Jacobian::CalcDeltaThetasSDLS() { // Calculate the dTheta from pure pseudoinverse considerations double scale = alpha * - wiInv; // This times i-th column of V is the psuedoinverse response + wiInv; // This times i-th column of V is the pseudoinverse response dPreTheta.LoadScaled(V.GetColumnPtr(i), scale); // Now rescale the dTheta values. double max = dPreTheta.MaxAbs(); diff --git a/toonz/sources/toonzlib/imagemanager.cpp b/toonz/sources/toonzlib/imagemanager.cpp index 1391fe7..1b0f182 100644 --- a/toonz/sources/toonzlib/imagemanager.cpp +++ b/toonz/sources/toonzlib/imagemanager.cpp @@ -397,7 +397,7 @@ void ImageManager::loadAllTlvIconsAndPutInCache( assert(builder); assert(builder->getRefCount() > 0); - // this function in reimpremented only in ImageLoader + // this function in reimplemented only in ImageLoader builder->buildAllIconsAndPutInCache(level, fids, iconIds, cacheImagesAsWell); builder->getInfo(info, ImageManager::none, 0); diff --git a/toonz/sources/toonzqt/addfxcontextmenu.cpp b/toonz/sources/toonzqt/addfxcontextmenu.cpp index fc2f1c2..40c5573 100644 --- a/toonz/sources/toonzqt/addfxcontextmenu.cpp +++ b/toonz/sources/toonzqt/addfxcontextmenu.cpp @@ -415,7 +415,7 @@ bool AddFxContextMenu::loadPreset(const std::string &name, QMenu *insertFxGroup, // This is a workaround to set the bold style to the first element of this // menu - // Setting a font directly to a QAction is not enought; style sheet + // Setting a font directly to a QAction is not enough; style sheet // definitions // preval over QAction font settings. inserMenu->setObjectName("fxMenu"); diff --git a/toonz/sources/toonzqt/docklayout.cpp b/toonz/sources/toonzqt/docklayout.cpp index 0194b15..252199f 100644 --- a/toonz/sources/toonzqt/docklayout.cpp +++ b/toonz/sources/toonzqt/docklayout.cpp @@ -1663,7 +1663,7 @@ DockPlaceholder *DockDecoAllocator::newPlaceholder(DockWidget *owner, Region *r, //------------------------------------------------------ -// BuildGeometry() method should not be called inside the base contructor - +// BuildGeometry() method should not be called inside the base constructor - // because it's a virtual method. // So we provide this little inline... DockPlaceholder *DockDecoAllocator::newPlaceBuilt(DockWidget *owner, Region *r, diff --git a/toonz/sources/toonzqt/docklayout.h b/toonz/sources/toonzqt/docklayout.h index f35c68c..c279874 100644 --- a/toonz/sources/toonzqt/docklayout.h +++ b/toonz/sources/toonzqt/docklayout.h @@ -97,8 +97,8 @@ public: void update(); // Re-applies partition found void redistribute(); // Calculates partition - void applyTransform(const QTransform &transform); // Applies tranformation to - // known parition - Da + void applyTransform(const QTransform &transform); // Applies transformation to + // known partition - Da // rimuovere, non serve... DockWidget *getMaximized() { return m_maximizedDock; } @@ -278,7 +278,7 @@ public: // Decorations allocator void setDecoAllocator(DockDecoAllocator *decoAllocator); - // reimpremented in FlipbookPanel + // reimplemented in FlipbookPanel virtual void onDock(bool docked) {} private: @@ -382,7 +382,7 @@ private: // Dock Placeholder //--------------------------- -//! A dock placeholder contains the necessary informations about a possible +//! A dock placeholder contains the necessary information about a possible //! docking solution. /*! @@ -405,11 +405,11 @@ class DockPlaceholder : public QWidget { friend class DockLayout; // DockLayout is granted access to placeholders' // privates - // Docking informations - private + // Docking information - private Region *m_region; int m_idx; - // Docking informations - public + // Docking information - public int m_attributes; // Owner @@ -478,7 +478,7 @@ private: Every subRegion, if present, has opposite subdivision direction with respect to parent one. In addition, regions possess lists of separators and placeholders found along its subdivision direction. - Region informations are owned by the DockLayout who allocates it; however, + Region information is owned by the DockLayout who allocates it; however, they are read-only accessible by the user. \sa DockLayout, DockWidget, DockSeparator and DockPlaceholder classes. diff --git a/toonz/sources/toonzqt/dockwidget.cpp b/toonz/sources/toonzqt/dockwidget.cpp index bd513c2..c7100a1 100644 --- a/toonz/sources/toonzqt/dockwidget.cpp +++ b/toonz/sources/toonzqt/dockwidget.cpp @@ -113,7 +113,7 @@ DockWidget::DockWidget(QWidget *parent, Qt::WindowFlags flags) , m_parentLayout(0) , m_selectedPlace(0) , m_maximized(0) { - // Don't let this widget inherit the parent's backround color + // Don't let this widget inherit the parent's background color // setAutoFillBackground(true); // setBackgroundRole(QPalette::Background); diff --git a/toonz/sources/toonzqt/dvdialog.cpp b/toonz/sources/toonzqt/dvdialog.cpp index d65d6ff..3a33dcb 100644 --- a/toonz/sources/toonzqt/dvdialog.cpp +++ b/toonz/sources/toonzqt/dvdialog.cpp @@ -190,7 +190,7 @@ layout, a collection of must recall endVLayout(), this add horizontal layout to first part of dialog. - This struct permit you to allign the object you insert. + This struct permit you to align the object you insert. \n If you need vertical layout you can use an implemented vertical box layout composed of two column, the function beginVLayout() initialize the @@ -198,7 +198,7 @@ vertical box layout, a collection of function permit to insert object in this layout. All this functions insert a pair of object in two vertical layout and permit - to allign the objects, all pairs you insert are tabulated. + to align the objects, all pairs you insert are tabulated. At the end you must recall endVLayout(), this add vertical layout to first part of dialog. @@ -679,7 +679,7 @@ void Dialog::addSeparator(QString name) { } //----------------------------------------------------------------------------- -/*! Set the alignement of the main layout +/*! Set the alignment of the main layout */ void Dialog::setAlignment(Qt::Alignment alignment) { m_mainFrame->layout()->setAlignment(alignment); diff --git a/toonz/sources/toonzqt/flipconsole.cpp b/toonz/sources/toonzqt/flipconsole.cpp index 7fca16e..f4b5bfa 100644 --- a/toonz/sources/toonzqt/flipconsole.cpp +++ b/toonz/sources/toonzqt/flipconsole.cpp @@ -1361,7 +1361,7 @@ void FlipConsole::enableBlanks(bool state) { } //----------------------------------------------------------------------------- -/*! call consoleOwner->onDrawFrame() intead of emitting drawFrame signal +/*! call consoleOwner->onDrawFrame() instead of emitting drawFrame signal */ void FlipConsole::showCurrentFrame() { m_consoleOwner->onDrawFrame(m_currentFrame, m_settings); diff --git a/toonz/sources/toonzqt/functionsegmentviewer.cpp b/toonz/sources/toonzqt/functionsegmentviewer.cpp index c4cc812..6d10ec1 100644 --- a/toonz/sources/toonzqt/functionsegmentviewer.cpp +++ b/toonz/sources/toonzqt/functionsegmentviewer.cpp @@ -630,7 +630,7 @@ m_unitFld->setText(""); } //----------------------------------------------------------------------------- -/*! return false if a circular reference is occured +/*! return false if a circular reference is occurred */ bool FunctionExpressionSegmentPage::getGuiValues(std::string &expressionText, std::string &unitName) { diff --git a/toonz/sources/toonzqt/functiontreeviewer.cpp b/toonz/sources/toonzqt/functiontreeviewer.cpp index 1de6883..8ea83fe 100644 --- a/toonz/sources/toonzqt/functiontreeviewer.cpp +++ b/toonz/sources/toonzqt/functiontreeviewer.cpp @@ -6,7 +6,7 @@ #include "tfilepath_io.h" #include "tfunctorinvoker.h" -// TnzBase incudes +// TnzBase includes #include "tunit.h" #include "tparamcontainer.h" #include "tparamset.h" diff --git a/toonz/sources/toonzqt/fxschematicnode.cpp b/toonz/sources/toonzqt/fxschematicnode.cpp index a9cd864..31e227b 100644 --- a/toonz/sources/toonzqt/fxschematicnode.cpp +++ b/toonz/sources/toonzqt/fxschematicnode.cpp @@ -1674,7 +1674,7 @@ void FxSchematicPort::mouseReleaseEvent(QGraphicsSceneMouseEvent *me) { TZeraryColumnFx *colFx = dynamic_cast(targetOwnerFx); if (colFx) targetOwnerFx = colFx->getZeraryFx(); - // if the target fx has no dynamic port or has dinamic ports but the tatgert + // if the target fx has no dynamic port or has dynamic ports but the target // port is not an input port: do nothing! if (!targetOwnerFx || !targetOwnerFx->hasDynamicPortGroups() || targetPort->getType() != eFxInputPort) { @@ -1697,7 +1697,7 @@ void FxSchematicPort::mouseReleaseEvent(QGraphicsSceneMouseEvent *me) { int groupedPortCount = groupedPorts.size(); if (targetOwnerFx != m_ownerFx && me->modifiers() == Qt::ControlModifier && linkTo(targetPort, true)) { - // trying to link different fxs insertin the new link and shifting the + // trying to link different fxs inserting the new link and shifting the // others int targetIndex = getIndex(targetFxPort, groupedPorts); if (targetIndex == -1) { diff --git a/toonz/sources/toonzqt/gutil.cpp b/toonz/sources/toonzqt/gutil.cpp index 6e63e35..ef70f08 100644 --- a/toonz/sources/toonzqt/gutil.cpp +++ b/toonz/sources/toonzqt/gutil.cpp @@ -285,7 +285,7 @@ QIcon createQIcon(const char *iconSVGName, bool useFullOpacity, const qreal baseOpacity = useFullOpacity ? 1 : 0.8; const qreal disabledOpacity = 0.15; - // Psuedo state name strings + // Pseudo state name strings QString overStr = QString(iconSVGName) + "_over"; QString onStr = QString(iconSVGName) + "_on"; diff --git a/toonz/sources/toonzqt/icongenerator.cpp b/toonz/sources/toonzqt/icongenerator.cpp index caa66a7..d7df450 100644 --- a/toonz/sources/toonzqt/icongenerator.cpp +++ b/toonz/sources/toonzqt/icongenerator.cpp @@ -200,7 +200,7 @@ void makeChessBackground(const TRaster32P &ras) { //========================================== // -// Image-to-Icon convertion methods +// Image-to-Icon conversion methods // //------------------------------------------ @@ -1576,7 +1576,7 @@ void IconGenerator::invalidate(TXshLevel *xl, const TFrameId &fid, id += "_small"; if (iconsMap.find(id) == iconsMap.end()) return; - // Not-filmstrip icons diable all checks + // Not-filmstrip icons disable all checks IconGenerator::Settings oldSettings = m_settings; m_settings.m_transparencyCheck = false; m_settings.m_inkIndex = -1; diff --git a/toonz/sources/toonzqt/imageutils.cpp b/toonz/sources/toonzqt/imageutils.cpp index d05dc71..eedf823 100644 --- a/toonz/sources/toonzqt/imageutils.cpp +++ b/toonz/sources/toonzqt/imageutils.cpp @@ -627,7 +627,7 @@ void convert(const TFilePath &source, const TFilePath &dest, TRop::Triangle, frameNotifier, bgColor, removeDotBeforeFrameNumber); else if (srcExt == "pli") - // assert(!"Conversion from pli files is currently diabled"); + // assert(!"Conversion from pli files is currently disabled"); convertFromVector(lr, lw, frames, frameNotifier); else convertFromFullRaster(lr, lw, frames, TAffine(), TRop::Triangle, @@ -909,7 +909,7 @@ bool FullScreenWidget::toggleFullScreen( //============================================================= const bool kfApplicationQuitInProgress) // Indicates whether the - // application is quiting. + // application is quitting. /* * DESCRIPTION: @@ -948,7 +948,7 @@ bool FullScreenWidget::toggleFullScreen( fFullScreenStateToggled = true; } else { // There's no point to switching into full screen if the - // application is in the process of quiting. + // application is in the process of quitting. if (!kfApplicationQuitInProgress) { //============================================================== // diff --git a/toonz/sources/toonzqt/lineedit.cpp b/toonz/sources/toonzqt/lineedit.cpp index e7a3892..7d0ac10 100644 --- a/toonz/sources/toonzqt/lineedit.cpp +++ b/toonz/sources/toonzqt/lineedit.cpp @@ -52,7 +52,7 @@ void LineEdit::keyPressEvent(QKeyEvent *event) { case Qt::Key_Bar: case Qt::Key_Period: DVGui::info( - tr("A file name cannot contains any of the following chracters: " + tr("A file name cannot contains any of the following characters: " "/\\:*?\"<>|.")); return; default: diff --git a/toonz/sources/toonzqt/lutcalibrator.cpp b/toonz/sources/toonzqt/lutcalibrator.cpp index b8f7db0..22de93d 100644 --- a/toonz/sources/toonzqt/lutcalibrator.cpp +++ b/toonz/sources/toonzqt/lutcalibrator.cpp @@ -256,7 +256,7 @@ bool LutCalibrator::initializeLutTextureShader() { "#version 330 core \n" "// Interpolated values from the vertex shaders \n" "in vec2 UV; \n" - "// Ouput data \n" + "// Output data \n" "out vec4 color; \n" "// Values that stay constant for the whole mesh. \n" "uniform sampler2D tex; \n" @@ -484,7 +484,7 @@ bool LutManager::loadLutFile(const QString& fp) { //---- read the 3DLUT files - // The first line shoud start from "3DMESH" keyword (case sensitive) + // The first line should start from "3DMESH" keyword (case sensitive) line = locals::readDataLine(stream); if (line != "3DMESH") { file.close(); @@ -572,7 +572,7 @@ void LutManager::convert(float& r, float& g, float& b) { for (int c = 0; c < 3; c++) { float val = rawVal[c] * (float)(m_lut.meshSize - 1); index[c][0] = (int)val; - // boundary condition: if rawVal == 1 the value will not be interporated + // boundary condition: if rawVal == 1 the value will not be interpolated index[c][1] = (rawVal[c] >= 1.0f) ? index[c][0] : index[c][0] + 1; ratio[c] = val - (float)index[c][0]; } diff --git a/toonz/sources/toonzqt/palettesscanpopup.cpp b/toonz/sources/toonzqt/palettesscanpopup.cpp index e738dfb..ea28d83 100644 --- a/toonz/sources/toonzqt/palettesscanpopup.cpp +++ b/toonz/sources/toonzqt/palettesscanpopup.cpp @@ -146,7 +146,7 @@ void PalettesScanPopup::pop() { } //----------------------------------------------------------------------------- -/*! Return true if direcories stack is not empty; otherwise return false. +/*! Return true if directories stack is not empty; otherwise return false. \n If stack is not empty check current directory: \li if all files are checked recall \b pop(); \li if its path is a directory recall \b push(const TFilePath &fp); diff --git a/toonz/sources/toonzqt/paletteviewergui.cpp b/toonz/sources/toonzqt/paletteviewergui.cpp index 8689c5b..759eaab 100644 --- a/toonz/sources/toonzqt/paletteviewergui.cpp +++ b/toonz/sources/toonzqt/paletteviewergui.cpp @@ -81,7 +81,7 @@ using namespace DVGui; the style is displayed as tooltip. \li SmallChipsWithName: - displays styles as small squares with the name insde. + displays styles as small squares with the name inside. \li LargeChips: displays the styles on top of the name of the style. \li List: List displays style @@ -811,7 +811,7 @@ void PageViewer::paintEvent(QPaintEvent *e) { } else if (m_nameDisplayMode == StyleAndOriginal) { drawChipName(p, chipRect, name); - // display original name only whne LargeChip view + // display original name only when LargeChip view if (m_viewMode == LargeChips && origName != L"") { tmpFont.setItalic(true); tmpFont.setPixelSize(tmpFont.pixelSize() - 3); @@ -1016,7 +1016,7 @@ void PageViewer::mousePressEvent(QMouseEvent *event) { } //----------------------------------------------------------------------------- -/*! If left botton is pressed start drag. +/*! If left button is pressed start drag. */ void PageViewer::mouseMoveEvent(QMouseEvent *event) { if (!m_page) return; diff --git a/toonz/sources/toonzqt/plugin_param_traits.h b/toonz/sources/toonzqt/plugin_param_traits.h index 8960680..4c95b0c 100644 --- a/toonz/sources/toonzqt/plugin_param_traits.h +++ b/toonz/sources/toonzqt/plugin_param_traits.h @@ -308,7 +308,7 @@ struct set_param_default_t { template <> struct set_param_default_t { static bool set_param_default(Param *param, const toonz_param_desc_t *desc) { - /* unfortunatly, TSpectrumParam's default values must be set within the + /* unfortunately, TSpectrumParam's default values must be set within the constructor, for now. see param_factory_< TSpectrumParam >() */ return false; @@ -407,7 +407,7 @@ inline T *param_factory_(const toonz_param_desc_t *desc) { template <> inline TPointParam *param_factory_(const toonz_param_desc_t *desc) { - return new TPointParam(TPointD(), true /* instanciate from plugin */); + return new TPointParam(TPointD(), true /* instantiate from plugin */); } template <> diff --git a/toonz/sources/toonzqt/pluginhost.cpp b/toonz/sources/toonzqt/pluginhost.cpp index a7b5f94..8bf7bef 100644 --- a/toonz/sources/toonzqt/pluginhost.cpp +++ b/toonz/sources/toonzqt/pluginhost.cpp @@ -1401,7 +1401,7 @@ toonz_plugin_info で検索し、なければ toonz_plugin_probe() を呼び出� if (problist) { if (!is_compatible(*problist)) throw std::domain_error( - "invaid toonz_plugin_info_list: version unmatched"); + "invalid toonz_plugin_info_list: version unmatched"); probinfo_begin = problist->begin; probinfo_end = problist->end; } @@ -1498,7 +1498,7 @@ toonz_plugin_info で検索し、なければ toonz_plugin_probe() を呼び出� throw std::domain_error("not found _toonz_plugin_init"); } } catch (const std::exception &e) { - printf("Exception occured after plugin loading: %s\n", e.what()); + printf("Exception occurred after plugin loading: %s\n", e.what()); } if (pi->handler_ && pi->handler_->setup) { @@ -1517,7 +1517,7 @@ toonz_plugin_info で検索し、なければ toonz_plugin_probe() を呼び出� } } } catch (const std::exception &e) { - printf("Exception occured while plugin loading: %s\n", e.what()); + printf("Exception occurred while plugin loading: %s\n", e.what()); delete pi; pi = NULL; } @@ -1560,7 +1560,7 @@ PluginLoadController::PluginLoadController(const std::string &basedir, connect(&work_entity, &QThread::finished, ld, &QObject::deleteLater); /* AddFxContextMenu から呼ばれていたが、プラグインの検索が load_entries() を通じて起動時に呼ばれるようにした関係で, - (あまりよくはないが)listner の有無によって receiver を分けるようにしている. + (あまりよくはないが)listener の有無によって receiver を分けるようにしている. listener がいる場合は従来通り context menu の構築のために AddFxContextMenu::fixup() に接続するが それ以外では plugin_dict_ への追加のため PluginLoadController::finished diff --git a/toonz/sources/toonzqt/schematicnode.cpp b/toonz/sources/toonzqt/schematicnode.cpp index e9e095d..e834b09 100644 --- a/toonz/sources/toonzqt/schematicnode.cpp +++ b/toonz/sources/toonzqt/schematicnode.cpp @@ -873,7 +873,7 @@ QPointF SchematicPort::getLinkEndPoint() const { return scenePos() + m_hook; } // //======================================================== -/*! \class SchematicNode schematicnode.h "../inlcude/toonzqt/schematicnode.h" +/*! \class SchematicNode schematicnode.h "../include/toonzqt/schematicnode.h" \brief The class provides methods to draw and handle a node item in the SchematicScene. */ diff --git a/toonz/sources/toonzqt/schematicviewer.cpp b/toonz/sources/toonzqt/schematicviewer.cpp index 56e471e..30a19af 100644 --- a/toonz/sources/toonzqt/schematicviewer.cpp +++ b/toonz/sources/toonzqt/schematicviewer.cpp @@ -412,7 +412,7 @@ void SchematicSceneViewer::wheelEvent(QWheelEvent *me) { void SchematicSceneViewer::zoomQt(bool zoomin, bool resetView) { if (resetView) { resetMatrix(); - // reseting will set view to the center of items bounding + // resetting will set view to the center of items bounding centerOn(scene()->itemsBoundingRect().center()); return; } @@ -987,7 +987,7 @@ void SchematicViewer::createActions() { // Switch display of stage schematic's output port switchPort = - new QAction(tr("&Swtich output port display mode"), m_stageToolbar); + new QAction(tr("&Switch output port display mode"), m_stageToolbar); switchPort->setCheckable(true); switchPort->setChecked(m_stageScene->isShowLetterOnPortFlagEnabled()); QIcon switchPortIcon = createQIcon("switchport"); @@ -1152,7 +1152,7 @@ void SchematicViewer::setStageSchematicViewed(bool isStageSchematic) { } //------------------------------------------------------------------ -// called when the signals xshLevelChanged or objectSwitched is emited +// called when the signals xshLevelChanged or objectSwitched is emitted void SchematicViewer::updateScenes() { TStageObjectId id = m_stageScene->getCurrentObject(); if (id.isColumn()) { diff --git a/toonz/sources/toonzqt/spectrumfield.cpp b/toonz/sources/toonzqt/spectrumfield.cpp index 5306f73..4d87e6f 100644 --- a/toonz/sources/toonzqt/spectrumfield.cpp +++ b/toonz/sources/toonzqt/spectrumfield.cpp @@ -186,7 +186,7 @@ void SpectrumBar::paintEvent(QPaintEvent *e) { } //----------------------------------------------------------------------------- -/*! Manage mouse press event. Search exsisting key near click position, if +/*! Manage mouse press event. Search existing key near click position, if there is set it as current key; otherwise add a new key in click position. */ diff --git a/toonz/sources/toonzqt/styleeditor.cpp b/toonz/sources/toonzqt/styleeditor.cpp index e05508a..6d98686 100644 --- a/toonz/sources/toonzqt/styleeditor.cpp +++ b/toonz/sources/toonzqt/styleeditor.cpp @@ -558,7 +558,7 @@ QPixmap makeSquareShading(const ColorModel &color, ColorChannel channel, HexagonalColorWheel::HexagonalColorWheel(QWidget *parent) : GLWidgetForHighDpi(parent) - , m_bgColor(128, 128, 128) // defaul value in case this value does not set + , m_bgColor(128, 128, 128) // default value in case this value does not set // in the style sheet { setObjectName("HexagonalColorWheel"); @@ -619,7 +619,7 @@ void HexagonalColorWheel::initializeGL() { glClearColor(color.redF(), color.greenF(), color.blueF(), color.alphaF()); // Without the following lines, the wheel in a floating style editor - // dissapears on switching the room due to context switching. + // disappears on switching the room due to context switching. if (m_firstInitialized) m_firstInitialized = false; else { diff --git a/toonz/sources/toonzqt/styleselection.cpp b/toonz/sources/toonzqt/styleselection.cpp index 0a3c515..4300756 100644 --- a/toonz/sources/toonzqt/styleselection.cpp +++ b/toonz/sources/toonzqt/styleselection.cpp @@ -1636,7 +1636,7 @@ public: }; //----------------------------------------------------------------------------- -/*! remove link from studio palette. Delete the global and the orginal names. +/*! remove link from studio palette. Delete the global and the original names. * return true if something changed */ void TStyleSelection::removeLink() {