Fixed: #1193 Compilation with GCC (SchemeManager). Fix typos in comments/code.

This commit is contained in:
dnk-88 2011-05-09 13:25:03 +03:00
parent 65b8f494e9
commit 1637ec17f9
13 changed files with 50 additions and 53 deletions

View file

@ -31,7 +31,7 @@ PROJECT_NAME = "Object Viewer Qt"
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = r90 PROJECT_NUMBER =
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.
@ -643,7 +643,7 @@ FILE_PATTERNS = *.c \
# should be searched for input files as well. Possible values are YES and NO. # should be searched for input files as well. Possible values are YES and NO.
# If left blank NO is used. # If left blank NO is used.
RECURSIVE = NO RECURSIVE = YES
# The EXCLUDE tag can be used to specify files and/or directories that should # The EXCLUDE tag can be used to specify files and/or directories that should
# excluded from the INPUT source files. This way you can easily exclude a # excluded from the INPUT source files. This way you can easily exclude a

View file

@ -40,7 +40,6 @@ class IPluginSpec;
class IPluginManager: public QObject class IPluginManager: public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
IPluginManager(QObject *parent = 0): QObject(parent) {} IPluginManager(QObject *parent = 0): QObject(parent) {}
virtual ~IPluginManager() {} virtual ~IPluginManager() {}

View file

@ -292,4 +292,4 @@ void CPluginManager::deleteAll()
} }
} }
}; // namespace NLQT }; // namespace ExtensionSystem

View file

@ -74,6 +74,6 @@ private:
}; // class CPluginManager }; // class CPluginManager
} // namespace NLQT } // namespace ExtensionSystem
#endif // PLUGINMANAGER_H #endif // PLUGINMANAGER_H

View file

@ -266,4 +266,4 @@ bool CPluginSpec::reportError(const QString &err)
return false; return false;
} }
} // namespace NLQT } // namespace ExtensionSystem

View file

@ -79,7 +79,7 @@ private:
friend class CPluginManager; friend class CPluginManager;
}; };
} // namespace NLQT } // namespace ExtensionSystem
#endif // PLUGINSPEC_H #endif // PLUGINSPEC_H

View file

@ -605,25 +605,21 @@ void CParticleSystemPage::setMaxSteps(uint32 value)
void CParticleSystemPage::setUserParam1(float value) void CParticleSystemPage::setUserParam1(float value)
{ {
_Node->getPSPointer()->setUserParam(0, value); _Node->getPSPointer()->setUserParam(0, value);
updateModifiedFlag();
} }
void CParticleSystemPage::setUserParam2(float value) void CParticleSystemPage::setUserParam2(float value)
{ {
_Node->getPSPointer()->setUserParam(1, value); _Node->getPSPointer()->setUserParam(1, value);
updateModifiedFlag();
} }
void CParticleSystemPage::setUserParam3(float value) void CParticleSystemPage::setUserParam3(float value)
{ {
_Node->getPSPointer()->setUserParam(2, value); _Node->getPSPointer()->setUserParam(2, value);
updateModifiedFlag();
} }
void CParticleSystemPage::setUserParam4(float value) void CParticleSystemPage::setUserParam4(float value)
{ {
_Node->getPSPointer()->setUserParam(3, value); _Node->getPSPointer()->setUserParam(3, value);
updateModifiedFlag();
} }
void CParticleSystemPage::setMaxViewDist(float value) void CParticleSystemPage::setMaxViewDist(float value)

View file

@ -51,7 +51,6 @@ public:
// rename a scheme, given a pointer on it // rename a scheme, given a pointer on it
void rename(NL3D::CPSAttribMakerBase *am, const std::string &newName); void rename(NL3D::CPSAttribMakerBase *am, const std::string &newName);
protected: protected:
typedef std::pair<std::string, NL3D::CPSAttribMakerBase *> TSchemeInfo;
typedef std::multimap<std::string, TSchemeInfo> TSchemeMap; typedef std::multimap<std::string, TSchemeInfo> TSchemeMap;
TSchemeMap _SchemeMap; TSchemeMap _SchemeMap;
}; };

View file

@ -154,6 +154,9 @@ void CGradientDialog::valueDown()
m_ui.listWidget->setCurrentRow(currentRow); m_ui.listWidget->setCurrentRow(currentRow);
} }
m_ui.listWidget->setCurrentRow(currentRow); m_ui.listWidget->setCurrentRow(currentRow);
--currentRow;
QListWidgetItem *item = m_ui.listWidget->item(currentRow);
m_clientInterface->displayValue(currentRow, item);
} }
void CGradientDialog::valueUp() void CGradientDialog::valueUp()