mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-18 14:42:27 +00:00
Code Issues Projects Releases Wiki Activity

functor-based Qt signal-slot syntax construction set: changing visibility of certain slots for connecting on external/derived classes

Browse Source
This commit is contained in:
mpeco 2022-08-22 23:53:19 -03:00
parent 78700eee57
commit 9040209046
7 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/opencs/model/world/data.hpp
View File

@ -318,10 +318,12 @@ namespace CSMWorld
void assetTablesChanged(); void assetTablesChanged();
private slots: public slots:
void assetsChanged(); void assetsChanged();
private slots:
void dataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight); void dataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
void rowsChanged (const QModelIndex& parent, int start, int end); void rowsChanged (const QModelIndex& parent, int start, int end);

2
apps/opencs/view/doc/view.cpp
View File

@ -261,7 +261,7 @@ void CSVDoc::View::setupAssetsMenu()
QMenu *assets = menuBar()->addMenu (tr ("Assets")); QMenu *assets = menuBar()->addMenu (tr ("Assets"));
QAction* reload = createMenuEntry("Reload", ":./menu-reload.png", assets, "document-assets-reload"); QAction* reload = createMenuEntry("Reload", ":./menu-reload.png", assets, "document-assets-reload");
connect (reload, SIGNAL (triggered()), &mDocument->getData(), SLOT (assetsChanged())); connect (reload, &QAction::triggered, &mDocument->getData(), &CSMWorld::Data::assetsChanged);
assets->addSeparator(); assets->addSeparator();

8
apps/opencs/view/world/genericcreator.hpp
View File

@ -118,13 +118,15 @@ namespace CSVWorld
/// Focus main input widget /// Focus main input widget
void focus() override; void focus() override;
private slots: protected slots:
void textChanged (const QString& text);
/// \brief Create record if able to after Return key is pressed on input. /// \brief Create record if able to after Return key is pressed on input.
void inputReturnPressed(); void inputReturnPressed();
private slots:
void textChanged (const QString& text);
void create(); void create();
void scopeChanged (int index); void scopeChanged (int index);

2
apps/opencs/view/world/infocreator.cpp
View File

@ -85,7 +85,7 @@ CSVWorld::InfoCreator::InfoCreator (CSMWorld::Data& data, QUndoStack& undoStack,
setManualEditing (false); setManualEditing (false);
connect (mTopic, &CSVWidget::DropLineEdit::textChanged, this, &InfoCreator::topicChanged); connect (mTopic, &CSVWidget::DropLineEdit::textChanged, this, &InfoCreator::topicChanged);
connect (mTopic, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed())); connect (mTopic, &CSVWidget::DropLineEdit::returnPressed, this, &InfoCreator::inputReturnPressed);
} }
void CSVWorld::InfoCreator::cloneMode (const std::string& originId, void CSVWorld::InfoCreator::cloneMode (const std::string& originId,

2
apps/opencs/view/world/pathgridcreator.cpp
View File

@ -43,7 +43,7 @@ CSVWorld::PathgridCreator::PathgridCreator(
insertBeforeButtons(mCell, true); insertBeforeButtons(mCell, true);
connect(mCell, &CSVWidget::DropLineEdit::textChanged, this, &PathgridCreator::cellChanged); connect(mCell, &CSVWidget::DropLineEdit::textChanged, this, &PathgridCreator::cellChanged);
connect(mCell, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed())); connect(mCell, &CSVWidget::DropLineEdit::returnPressed, this, &PathgridCreator::inputReturnPressed);
} }
void CSVWorld::PathgridCreator::cloneMode( void CSVWorld::PathgridCreator::cloneMode(

2
apps/opencs/view/world/referencecreator.cpp
View File

@ -44,7 +44,7 @@ CSVWorld::ReferenceCreator::ReferenceCreator (CSMWorld::Data& data, QUndoStack&
setManualEditing (false); setManualEditing (false);
connect (mCell, &CSVWidget::DropLineEdit::textChanged, this, &ReferenceCreator::cellChanged); connect (mCell, &CSVWidget::DropLineEdit::textChanged, this, &ReferenceCreator::cellChanged);
connect (mCell, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed())); connect (mCell, &CSVWidget::DropLineEdit::returnPressed, this, &ReferenceCreator::inputReturnPressed);
} }
void CSVWorld::ReferenceCreator::reset() void CSVWorld::ReferenceCreator::reset()

2
apps/opencs/view/world/startscriptcreator.cpp
View File

@ -45,7 +45,7 @@ CSVWorld::StartScriptCreator::StartScriptCreator(
insertBeforeButtons(mScript, true); insertBeforeButtons(mScript, true);
connect(mScript, &CSVWidget::DropLineEdit::textChanged, this, &StartScriptCreator::scriptChanged); connect(mScript, &CSVWidget::DropLineEdit::textChanged, this, &StartScriptCreator::scriptChanged);
connect(mScript, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed())); connect(mScript, &CSVWidget::DropLineEdit::returnPressed, this, &StartScriptCreator::inputReturnPressed);
} }
void CSVWorld::StartScriptCreator::cloneMode( void CSVWorld::StartScriptCreator::cloneMode(