Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #878 Fix typos in comments/code

Browse source
This commit is contained in:
kervala 2011-02-21 16:08:32 +01:00
parent 9937f56978
commit a8d8ec6e07
5 changed files with 47 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/src/3d/tile_bank.cpp
View file

@ -377,7 +377,6 @@ void CTileBank::makeAllPathRelative ()
// *************************************************************************** // ***************************************************************************
// Moi aussi je le parie (Yoyo).
void CTileBank::makeAllExtensionDDS () void CTileBank::makeAllExtensionDDS ()
{ {
// For all tiles // For all tiles

2
code/nel/src/misc/aabbox.cpp
View file

@ -21,8 +21,6 @@
#include "nel/misc/bsphere.h" #include "nel/misc/bsphere.h"
#include "nel/misc/matrix.h" #include "nel/misc/matrix.h"
namespace NLMISC { namespace NLMISC {

84
code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp
View file

@ -15,42 +15,42 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "log_plugin.h" #include "log_plugin.h"
#include "log_settings_page.h" #include "log_settings_page.h"
// Qt includes // Qt includes
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtGui/QMessageBox> #include <QtGui/QMessageBox>
#include <QtGui/QMainWindow> #include <QtGui/QMainWindow>
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtGui/QMenuBar> #include <QtGui/QMenuBar>
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QFile> #include <QFile>
#include <QDateTime> #include <QDateTime>
#include <QTextStream> #include <QTextStream>
// NeL includes // NeL includes
#include <nel/misc/debug.h> #include <nel/misc/debug.h>
// Project includes // Project includes
#include "../../extension_system/iplugin_spec.h" #include "../../extension_system/iplugin_spec.h"
#include "qt_displayer.h" #include "qt_displayer.h"
using namespace Plugin; using namespace Plugin;
namespace ExtensionSystem namespace ExtensionSystem
{ {
class IPluginSpec; class IPluginSpec;
} }
CLogPlugin::CLogPlugin(QWidget *parent): QDockWidget(parent) CLogPlugin::CLogPlugin(QWidget *parent): QDockWidget(parent)
{ {
_ui.setupUi(this); _ui.setupUi(this);
} }
CLogPlugin::~CLogPlugin() CLogPlugin::~CLogPlugin()
{ {
NLMISC::ErrorLog->removeDisplayer(_displayer); NLMISC::ErrorLog->removeDisplayer(_displayer);
@ -98,7 +98,7 @@ void CLogPlugin::setNelContext(NLMISC::INelContext *nelContext)
// Ensure that a context doesn't exist yet. // Ensure that a context doesn't exist yet.
// This only applies to platforms without PIC, e.g. Windows. // This only applies to platforms without PIC, e.g. Windows.
nlassert(!NLMISC::INelContext::isContextInitialised()); nlassert(!NLMISC::INelContext::isContextInitialised());
#endif // fdef NL_OS_WINDOWS^M #endif // fdef NL_OS_WINDOWS^M
_LibContext = new NLMISC::CLibraryContext(*nelContext); _LibContext = new NLMISC::CLibraryContext(*nelContext);
_displayer = new NLQT::CQtDisplayer(_ui.plainTextEdit); _displayer = new NLQT::CQtDisplayer(_ui.plainTextEdit);
@ -120,30 +120,30 @@ QString CLogPlugin::vendor() const
return "aquiles"; return "aquiles";
} }
QString CLogPlugin::description() const QString CLogPlugin::description() const
{ {
return "DockWidget to display all log messages from NeL."; return "DockWidget to display all log messages from NeL.";
} }
QList<QString> CLogPlugin::dependencies() const QList<QString> CLogPlugin::dependencies() const
{ {
return QList<QString>(); return QList<QString>();
} }
QObject* CLogPlugin::objectByName(const QString &name) const QObject* CLogPlugin::objectByName(const QString &name) const
{ {
Q_FOREACH (QObject *qobj, _plugMan->allObjects()) Q_FOREACH (QObject *qobj, _plugMan->allObjects())
if (qobj->objectName() == name) if (qobj->objectName() == name)
return qobj; return qobj;
return 0; return 0;
} }
ExtensionSystem::IPluginSpec *CLogPlugin::pluginByName(const QString &name) const ExtensionSystem::IPluginSpec *CLogPlugin::pluginByName(const QString &name) const
{ {
Q_FOREACH (ExtensionSystem::IPluginSpec *spec, _plugMan->plugins()) Q_FOREACH (ExtensionSystem::IPluginSpec *spec, _plugMan->plugins())
if (spec->name() == name) if (spec->name() == name)
return spec; return spec;
return 0; return 0;
} }
Q_EXPORT_PLUGIN(CLogPlugin) Q_EXPORT_PLUGIN(CLogPlugin)

8
code/nel/tools/3d/tile_edit_qt/pic/pic_private.h
View file

@ -22,7 +22,7 @@ typedef struct PIC_PICTURE
/* /*
* JPG * JPG
*/ */
extern unsigned long Pic_JPG_Read( unsigned char *FileName, 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); unsigned long w, unsigned long h);
/* /*
* TGA * TGA
*/ */
extern unsigned long Pic_TGA_Read( unsigned char *FileName, extern unsigned long Pic_TGA_Read( unsigned char *FileName,
unsigned char **ppPal, unsigned char **ppDatas, unsigned char **ppPal, unsigned char **ppDatas,
unsigned long *pWidth, unsigned long *pHeight, 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); unsigned long w, unsigned long h, unsigned long d);
/* /*
* BMP * BMP
*/ */
extern unsigned long Pic_BMP_Read( unsigned char *FileName, extern unsigned long Pic_BMP_Read( unsigned char *FileName,
unsigned char **ppPal, unsigned char **ppDatas, unsigned char **ppPal, unsigned char **ppDatas,
unsigned long *pWidth, unsigned long *pHeight, 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); unsigned long w, unsigned long h, unsigned long d);
/* /*
* System * System
*/ */
extern void* Pic_malloc(unsigned long size); extern void* Pic_malloc(unsigned long size);
extern void* Pic_calloc(unsigned long count, unsigned long size); extern void* Pic_calloc(unsigned long count, unsigned long size);
extern void Pic_free(void *memblock); extern void Pic_free(void *memblock);

2
code/nel/tools/misc/extract_filename/extract_filename.cpp
View file

@ -190,7 +190,7 @@ void extractStringsFromBinary (const vector<char> &fileArray, set<string> &filen
// if we're pointing at a string the first 4 bytes ar the string length // if we're pointing at a string the first 4 bytes ar the string length
uint len=*(uint *)(arrayPointer+i); uint len=*(uint *)(arrayPointer+i);
// if the stringlength could be valid // if the string length could be valid
if (len>0 && len+i<=size) if (len>0 && len+i<=size)
{ {
uint k; uint k;