From a8d8ec6e0711b8bcc2b39e504dd3586b59c158df Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 21 Feb 2011 16:08:32 +0100 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/nel/src/3d/tile_bank.cpp | 1 - code/nel/src/misc/aabbox.cpp | 2 - .../src/plugins/log/log_plugin.cpp | 84 +++++++++---------- .../tools/3d/tile_edit_qt/pic/pic_private.h | 8 +- .../extract_filename/extract_filename.cpp | 2 +- 5 files changed, 47 insertions(+), 50 deletions(-) diff --git a/code/nel/src/3d/tile_bank.cpp b/code/nel/src/3d/tile_bank.cpp index e90e54214..361b3ea83 100644 --- a/code/nel/src/3d/tile_bank.cpp +++ b/code/nel/src/3d/tile_bank.cpp @@ -377,7 +377,6 @@ void CTileBank::makeAllPathRelative () // *************************************************************************** -// Moi aussi je le parie (Yoyo). void CTileBank::makeAllExtensionDDS () { // For all tiles diff --git a/code/nel/src/misc/aabbox.cpp b/code/nel/src/misc/aabbox.cpp index 9825ed366..7b5a49a8f 100644 --- a/code/nel/src/misc/aabbox.cpp +++ b/code/nel/src/misc/aabbox.cpp @@ -21,8 +21,6 @@ #include "nel/misc/bsphere.h" #include "nel/misc/matrix.h" - - namespace NLMISC { diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp index 936192a28..713be9e35 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp @@ -15,42 +15,42 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -*/ - -#include "log_plugin.h" -#include "log_settings_page.h" - -// Qt includes -#include -#include -#include -#include -#include -#include +*/ + +#include "log_plugin.h" +#include "log_settings_page.h" + +// Qt includes +#include +#include +#include +#include +#include +#include #include #include #include -#include - +#include + // NeL includes #include // Project includes #include "../../extension_system/iplugin_spec.h" -#include "qt_displayer.h" - -using namespace Plugin; - -namespace ExtensionSystem -{ - class IPluginSpec; -} +#include "qt_displayer.h" + +using namespace Plugin; + +namespace ExtensionSystem +{ + class IPluginSpec; +} CLogPlugin::CLogPlugin(QWidget *parent): QDockWidget(parent) { _ui.setupUi(this); } - + CLogPlugin::~CLogPlugin() { NLMISC::ErrorLog->removeDisplayer(_displayer); @@ -98,7 +98,7 @@ void CLogPlugin::setNelContext(NLMISC::INelContext *nelContext) // Ensure that a context doesn't exist yet. // This only applies to platforms without PIC, e.g. Windows. nlassert(!NLMISC::INelContext::isContextInitialised()); -#endif // fdef NL_OS_WINDOWS^M +#endif // fdef NL_OS_WINDOWS^M _LibContext = new NLMISC::CLibraryContext(*nelContext); _displayer = new NLQT::CQtDisplayer(_ui.plainTextEdit); @@ -120,30 +120,30 @@ QString CLogPlugin::vendor() const return "aquiles"; } -QString CLogPlugin::description() const +QString CLogPlugin::description() const { return "DockWidget to display all log messages from NeL."; } - -QList CLogPlugin::dependencies() const -{ - return QList(); -} - -QObject* CLogPlugin::objectByName(const QString &name) const -{ + +QList CLogPlugin::dependencies() const +{ + return QList(); +} + +QObject* CLogPlugin::objectByName(const QString &name) const +{ Q_FOREACH (QObject *qobj, _plugMan->allObjects()) if (qobj->objectName() == name) return qobj; - return 0; -} - -ExtensionSystem::IPluginSpec *CLogPlugin::pluginByName(const QString &name) const -{ + return 0; +} + +ExtensionSystem::IPluginSpec *CLogPlugin::pluginByName(const QString &name) const +{ Q_FOREACH (ExtensionSystem::IPluginSpec *spec, _plugMan->plugins()) if (spec->name() == name) return spec; - return 0; -} - -Q_EXPORT_PLUGIN(CLogPlugin) + return 0; +} + +Q_EXPORT_PLUGIN(CLogPlugin) diff --git a/code/nel/tools/3d/tile_edit_qt/pic/pic_private.h b/code/nel/tools/3d/tile_edit_qt/pic/pic_private.h index 164b2067d..2ecd984b7 100644 --- a/code/nel/tools/3d/tile_edit_qt/pic/pic_private.h +++ b/code/nel/tools/3d/tile_edit_qt/pic/pic_private.h @@ -22,7 +22,7 @@ typedef struct PIC_PICTURE /* * JPG -*/ + */ extern unsigned long Pic_JPG_Read( unsigned char *FileName, @@ -35,7 +35,7 @@ extern unsigned long Pic_JPG_Write( unsigned char *FileName, unsigned long w, unsigned long h); /* * TGA -*/ + */ extern unsigned long Pic_TGA_Read( unsigned char *FileName, unsigned char **ppPal, unsigned char **ppDatas, unsigned long *pWidth, unsigned long *pHeight, @@ -45,7 +45,7 @@ extern unsigned long Pic_TGA_Write( unsigned char *FileName, unsigned long w, unsigned long h, unsigned long d); /* * BMP -*/ + */ extern unsigned long Pic_BMP_Read( unsigned char *FileName, unsigned char **ppPal, unsigned char **ppDatas, unsigned long *pWidth, unsigned long *pHeight, @@ -56,7 +56,7 @@ extern unsigned long Pic_BMP_Write( unsigned char *FileName, unsigned long w, unsigned long h, unsigned long d); /* * System -*/ + */ extern void* Pic_malloc(unsigned long size); extern void* Pic_calloc(unsigned long count, unsigned long size); extern void Pic_free(void *memblock); diff --git a/code/nel/tools/misc/extract_filename/extract_filename.cpp b/code/nel/tools/misc/extract_filename/extract_filename.cpp index 5bb3632ef..c8ca13452 100644 --- a/code/nel/tools/misc/extract_filename/extract_filename.cpp +++ b/code/nel/tools/misc/extract_filename/extract_filename.cpp @@ -190,7 +190,7 @@ void extractStringsFromBinary (const vector &fileArray, set &filen // if we're pointing at a string the first 4 bytes ar the string length uint len=*(uint *)(arrayPointer+i); - // if the stringlength could be valid + // if the string length could be valid if (len>0 && len+i<=size) { uint k;