mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-24 09:58:46 +00:00
Fixed: #1193 Compilation with GCC (SchemeManager). Fix typos in comments/code.
This commit is contained in:
parent
df6d71d0b8
commit
d5fd2b0825
13 changed files with 50 additions and 53 deletions
|
@ -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
|
||||||
|
|
|
@ -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() {}
|
||||||
|
|
|
@ -292,4 +292,4 @@ void CPluginManager::deleteAll()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}; // namespace NLQT
|
}; // namespace ExtensionSystem
|
|
@ -74,6 +74,6 @@ private:
|
||||||
|
|
||||||
}; // class CPluginManager
|
}; // class CPluginManager
|
||||||
|
|
||||||
} // namespace NLQT
|
} // namespace ExtensionSystem
|
||||||
|
|
||||||
#endif // PLUGINMANAGER_H
|
#endif // PLUGINMANAGER_H
|
||||||
|
|
|
@ -266,4 +266,4 @@ bool CPluginSpec::reportError(const QString &err)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace NLQT
|
} // namespace ExtensionSystem
|
|
@ -79,7 +79,7 @@ private:
|
||||||
friend class CPluginManager;
|
friend class CPluginManager;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace NLQT
|
} // namespace ExtensionSystem
|
||||||
|
|
||||||
#endif // PLUGINSPEC_H
|
#endif // PLUGINSPEC_H
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ const char * const OVQT_CORE_PLUGIN = "Core";
|
||||||
const char * const MAIN_WINDOW = "ObjectViewerQt.MainWindow";
|
const char * const MAIN_WINDOW = "ObjectViewerQt.MainWindow";
|
||||||
|
|
||||||
//menubar
|
//menubar
|
||||||
const char * const MENU_BAR = "ObjectViewerQt.MenuBar";
|
const char * const MENU_BAR = "ObjectViewerQt.MenuBar";
|
||||||
|
|
||||||
//menus
|
//menus
|
||||||
const char * const M_FILE = "ObjectViewerQt.Menu.File";
|
const char * const M_FILE = "ObjectViewerQt.Menu.File";
|
||||||
|
@ -54,11 +54,11 @@ const char * const SETTINGS = "ObjectViewerQt.Settings";
|
||||||
const char * const TOGGLE_FULLSCREEN = "ObjectViewerQt.ToggleFullScreen";
|
const char * const TOGGLE_FULLSCREEN = "ObjectViewerQt.ToggleFullScreen";
|
||||||
|
|
||||||
const char * const CLOSE = "ObjectViewerQt.Close";
|
const char * const CLOSE = "ObjectViewerQt.Close";
|
||||||
const char * const CLOSEALL = "ObjectViewerQt.CloseAll";
|
const char * const CLOSEALL = "ObjectViewerQt.CloseAll";
|
||||||
const char * const CLOSEOTHERS = "ObjectViewerQt.CloseOthers";
|
const char * const CLOSEOTHERS = "ObjectViewerQt.CloseOthers";
|
||||||
const char * const ABOUT = "ObjectViewerQt.About";
|
const char * const ABOUT = "ObjectViewerQt.About";
|
||||||
const char * const ABOUT_PLUGINS = "ObjectViewerQt.AboutPlugins";
|
const char * const ABOUT_PLUGINS = "ObjectViewerQt.AboutPlugins";
|
||||||
const char * const ABOUT_QT = "ObjectViewerQt.AboutQt";
|
const char * const ABOUT_QT = "ObjectViewerQt.AboutQt";
|
||||||
|
|
||||||
//settings
|
//settings
|
||||||
const char * const DATA_PATH_SECTION = "DataPath";
|
const char * const DATA_PATH_SECTION = "DataPath";
|
||||||
|
@ -68,7 +68,7 @@ const char * const LEVELDESIGN_PATH = "LevelDesignPath";
|
||||||
const char * const ASSETS_PATH = "LevelDesignPath";
|
const char * const ASSETS_PATH = "LevelDesignPath";
|
||||||
|
|
||||||
//resources
|
//resources
|
||||||
const char * const ICON_NEL = ":/core/images/nel.png";
|
const char * const ICON_NEL = ":/core/images/nel.png";
|
||||||
const char * const ICON_SETTINGS = ":/core/images/preferences.png";
|
const char * const ICON_SETTINGS = ":/core/images/preferences.png";
|
||||||
const char * const ICON_PILL = ":/core/icons/ic_nel_pill.png";
|
const char * const ICON_PILL = ":/core/icons/ic_nel_pill.png";
|
||||||
const char * const ICON_OPEN = ":/core/icons/ic_nel_open.png";
|
const char * const ICON_OPEN = ":/core/icons/ic_nel_open.png";
|
||||||
|
|
|
@ -214,7 +214,7 @@ public:
|
||||||
{
|
{
|
||||||
return _FontGen;
|
return _FontGen;
|
||||||
}
|
}
|
||||||
|
|
||||||
CSchemeManager *getSchemeManager () const
|
CSchemeManager *getSchemeManager () const
|
||||||
{
|
{
|
||||||
return _SchemeManager;
|
return _SchemeManager;
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -177,7 +177,7 @@ CParticleTreeModel::~CParticleTreeModel()
|
||||||
int CParticleTreeModel::columnCount(const QModelIndex &parent) const
|
int CParticleTreeModel::columnCount(const QModelIndex &parent) const
|
||||||
{
|
{
|
||||||
if (parent.isValid())
|
if (parent.isValid())
|
||||||
return static_cast<CParticleTreeItem*>(parent.internalPointer())->columnCount();
|
return static_cast<CParticleTreeItem *>(parent.internalPointer())->columnCount();
|
||||||
else
|
else
|
||||||
return _rootItem->columnCount();
|
return _rootItem->columnCount();
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,10 +25,10 @@
|
||||||
|
|
||||||
namespace NL3D
|
namespace NL3D
|
||||||
{
|
{
|
||||||
class CPSAttribMakerBase;
|
class CPSAttribMakerBase;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace NLQT
|
namespace NLQT
|
||||||
{
|
{
|
||||||
|
|
||||||
class CSchemeManager
|
class CSchemeManager
|
||||||
|
@ -50,10 +50,9 @@ public:
|
||||||
void remove(NL3D::CPSAttribMakerBase *am);
|
void remove(NL3D::CPSAttribMakerBase *am);
|
||||||
// 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;
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace NLQT */
|
} /* namespace NLQT */
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
|
// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
|
||||||
// Copyright (C) 2010 Winch Gate Property Limited
|
// Copyright (C) 2010 Winch Gate Property Limited
|
||||||
// Copyright (C) 2011 Dzmitry Kamiahin <dnk-88@tut.by>
|
// Copyright (C) 2011 Dzmitry Kamiahin <dnk-88@tut.by>
|
||||||
//
|
//
|
||||||
// This program is free software: you can redistribute it and/or modify
|
// This program is free software: you can redistribute it and/or modify
|
||||||
// it under the terms of the GNU Affero General Public License as
|
// it under the terms of the GNU Affero General Public License as
|
||||||
// published by the Free Software Foundation, either version 3 of the
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
// License, or (at your option) any later version.
|
// License, or (at your option) any later version.
|
||||||
//
|
//
|
||||||
// This program is distributed in the hope that it will be useful,
|
// This program is distributed in the hope that it will be useful,
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
// GNU Affero General Public License for more details.
|
// GNU Affero General Public License for more details.
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU Affero General Public License
|
// You should have received a copy of the GNU Affero 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/>.
|
||||||
|
|
||||||
// Projects include
|
// Projects include
|
||||||
|
@ -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()
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
|
// Object Viewer Qt - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
|
||||||
// Copyright (C) 2010 Winch Gate Property Limited
|
// Copyright (C) 2010 Winch Gate Property Limited
|
||||||
// Copyright (C) 2011 Dzmitry Kamiahin <dnk-88@tut.by>
|
// Copyright (C) 2011 Dzmitry Kamiahin <dnk-88@tut.by>
|
||||||
//
|
//
|
||||||
// This program is free software: you can redistribute it and/or modify
|
// This program is free software: you can redistribute it and/or modify
|
||||||
// it under the terms of the GNU Affero General Public License as
|
// it under the terms of the GNU Affero General Public License as
|
||||||
// published by the Free Software Foundation, either version 3 of the
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
// License, or (at your option) any later version.
|
// License, or (at your option) any later version.
|
||||||
//
|
//
|
||||||
// This program is distributed in the hope that it will be useful,
|
// This program is distributed in the hope that it will be useful,
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
// GNU Affero General Public License for more details.
|
// GNU Affero General Public License for more details.
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU Affero General Public License
|
// You should have received a copy of the GNU Affero 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/>.
|
||||||
|
|
||||||
#ifndef VALUE_GRADIENT_DIALOG_H
|
#ifndef VALUE_GRADIENT_DIALOG_H
|
||||||
|
|
Loading…
Reference in a new issue