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

Changed: #1193 code cleanup.

Browse source
This commit is contained in:
dnk-88 2011-02-16 20:12:33 +02:00
parent de37da056a
commit 04a974c818
4 changed files with 71 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
code/nel/tools/3d/object_viewer_qt/src/color_edit_widget.cpp
View file

@ -33,8 +33,8 @@ namespace NLQT
CColorEditWidget::CColorEditWidget(QWidget *parent) CColorEditWidget::CColorEditWidget(QWidget *parent)
: QWidget(parent), : QWidget(parent),
_Wrapper(NULL), _Wrapper(NULL),
_emit(true) _emit(true)
{ {
_ui.setupUi(this); _ui.setupUi(this);
@ -87,8 +87,8 @@ void CColorEditWidget::setRed(int r)
{ {
if (_emit) if (_emit)
Q_EMIT colorChanged(NLMISC::CRGBA(r, _ui.gSpinBox->value(), Q_EMIT colorChanged(NLMISC::CRGBA(r, _ui.gSpinBox->value(),
_ui.bSpinBox->value(), _ui.bSpinBox->value(),
_ui.aSpinBox->value())); _ui.aSpinBox->value()));
_ui.graphicsWidget->repaint(); _ui.graphicsWidget->repaint();
if (_Wrapper == NULL) if (_Wrapper == NULL)
@ -108,9 +108,9 @@ void CColorEditWidget::setGreen(int g)
{ {
if (_emit) if (_emit)
Q_EMIT colorChanged(NLMISC::CRGBA(_ui.rSpinBox->value(), Q_EMIT colorChanged(NLMISC::CRGBA(_ui.rSpinBox->value(),
g, g,
_ui.bSpinBox->value(), _ui.bSpinBox->value(),
_ui.aSpinBox->value())); _ui.aSpinBox->value()));
_ui.graphicsWidget->repaint(); _ui.graphicsWidget->repaint();
if (_Wrapper == NULL) return; if (_Wrapper == NULL) return;
@ -127,9 +127,9 @@ void CColorEditWidget::setBlue(int b)
{ {
if (_emit) if (_emit)
Q_EMIT colorChanged(NLMISC::CRGBA(_ui.rSpinBox->value(), Q_EMIT colorChanged(NLMISC::CRGBA(_ui.rSpinBox->value(),
_ui.gSpinBox->value(), _ui.gSpinBox->value(),
b, b,
_ui.aSpinBox->value())); _ui.aSpinBox->value()));
_ui.graphicsWidget->repaint(); _ui.graphicsWidget->repaint();
if (_Wrapper == NULL) return; if (_Wrapper == NULL) return;
@ -146,9 +146,9 @@ void CColorEditWidget::setAlpha(int a)
{ {
if (_emit) if (_emit)
Q_EMIT colorChanged(NLMISC::CRGBA(_ui.rSpinBox->value(), Q_EMIT colorChanged(NLMISC::CRGBA(_ui.rSpinBox->value(),
_ui.gSpinBox->value(), _ui.gSpinBox->value(),
_ui.bSpinBox->value(), _ui.bSpinBox->value(),
a)); a));
_ui.graphicsWidget->repaint(); _ui.graphicsWidget->repaint();
if (_Wrapper == NULL) return; if (_Wrapper == NULL) return;

2
code/nel/tools/3d/object_viewer_qt/src/direction_widget.cpp
View file

@ -205,7 +205,7 @@ bool CDirectionWidget::eventFilter(QObject *object, QEvent *event)
painter.drawText( 10, 15, widget->objectName()); painter.drawText( 10, 15, widget->objectName());
painter.setPen(QPen(Qt::red, 2, Qt::SolidLine)); painter.setPen(QPen(Qt::red, 2, Qt::SolidLine));
painter.drawLine(widget->width() / 2, widget->height() / 2, painter.drawLine(widget->width() / 2, widget->height() / 2,
int((widget->width() / 2) + x * 0.9f * directionSize), int((widget->height() / 2) - _value.z * 0.9f * directionSize)); int((widget->width() / 2) + x * 0.9f * directionSize), int((widget->height() / 2) - _value.z * 0.9f * directionSize));
break; break;
} }
case QEvent::MouseButtonDblClick: case QEvent::MouseButtonDblClick:

30
code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp
View file

@ -33,11 +33,19 @@
namespace ExtensionSystem namespace ExtensionSystem
{ {
CPluginSpec::CPluginSpec(): CPluginSpec::CPluginSpec()
_state(State::Invalid), : _location(""),
_hasError(false), _filePath(""),
_plugin(NULL), _fileName(""),
_pluginManager(NULL) _name(""),
_version(""),
_vendor(""),
_description(""),
_state(State::Invalid),
_hasError(false),
_errorString(""),
_plugin(0),
_pluginManager(0)
{ {
} }
@ -98,16 +106,6 @@ QString CPluginSpec::errorString() const
bool CPluginSpec::setFileName(const QString &fileName) bool CPluginSpec::setFileName(const QString &fileName)
{ {
_name = _version
= _vendor
= _description
= _location
= _filePath
= _fileName
= "";
_state = State::Invalid;
_hasError = false;
_errorString = "";
QFile file(fileName); QFile file(fileName);
if (!file.exists()) if (!file.exists())
return reportError(QCoreApplication::translate("CPluginSpec", "File does not exist: %1").arg(file.fileName())); return reportError(QCoreApplication::translate("CPluginSpec", "File does not exist: %1").arg(file.fileName()));
@ -209,7 +207,7 @@ void CPluginSpec::kill()
if (!_plugin) if (!_plugin)
return; return;
delete _plugin; delete _plugin;
_plugin = NULL; _plugin = 0;
_state = State::Deleted; _state = State::Deleted;
} }

1
code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.h
View file

@ -96,6 +96,7 @@ public:
break; break;
} }
} }
return result;
} }
protected: protected: