Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-01 06:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 28

Use modern Qt flag declarations

Browse source
This commit is contained in:
Andrei Kortunov 2020-06-22 10:05:25 +04:00
parent 573c630d34
commit 2b4274bca8
8 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/world/idtable.cpp
View file

@ -116,7 +116,7 @@ bool CSMWorld::IdTable::setData (const QModelIndex &index, const QVariant &value
Qt::ItemFlags CSMWorld::IdTable::flags (const QModelIndex & index) const
{
if (!index.isValid())
return 0;
return Qt::ItemFlags();
Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;

2
apps/opencs/view/prefs/contextmenulist.hpp
View file

@ -14,7 +14,7 @@ namespace CSVPrefs
public:
ContextMenuList(QWidget* parent = 0);
ContextMenuList(QWidget* parent = nullptr);
protected:

2
apps/opencs/view/render/orbitcameramode.hpp
View file

@ -21,7 +21,7 @@ namespace CSVRender
public:
OrbitCameraMode(WorldspaceWidget* worldspaceWidget, const QIcon& icon, const QString& tooltip = "",
QWidget* parent = 0);
QWidget* parent = nullptr);
~OrbitCameraMode();
virtual void activate(CSVWidget::SceneToolbar* toolbar);

6
apps/opencs/view/render/scenewidget.hpp
View file

@ -49,7 +49,7 @@ namespace CSVRender
Q_OBJECT
public:
RenderWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
RenderWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
virtual ~RenderWidget();
/// Initiates a request to redraw the view
@ -78,8 +78,8 @@ namespace CSVRender
{
Q_OBJECT
public:
SceneWidget(std::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = 0,
Qt::WindowFlags f = 0, bool retrieveInput = true);
SceneWidget(std::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = nullptr,
Qt::WindowFlags f = Qt::WindowFlags(), bool retrieveInput = true);
virtual ~SceneWidget();
CSVWidget::SceneToolMode *makeLightingSelector (CSVWidget::SceneToolbar *parent);

2
apps/opencs/view/render/worldspacewidget.cpp
View file

@ -33,7 +33,7 @@
#include "cameracontroller.hpp"
CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
: SceneWidget (document.getData().getResourceSystem(), parent, 0, false)
: SceneWidget (document.getData().getResourceSystem(), parent, Qt::WindowFlags(), false)
, mSceneElements(0)
, mRun(0)
, mDocument(document)

2
apps/opencs/view/world/table.cpp
View file

@ -671,7 +671,7 @@ void CSVWorld::Table::settingChanged (const CSMPrefs::Setting *setting)
{
std::string modifierString = setting->getKey().substr (6);
Qt::KeyboardModifiers modifiers = 0;
Qt::KeyboardModifiers modifiers;
if (modifierString=="-s")
modifiers = Qt::ShiftModifier;