Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 44ea6aa3 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Fixed various GCC/CppCheck issues.

parent bbed0142
......@@ -150,14 +150,14 @@ namespace campvis {
return;
QString textUnderCursor = text().left(cursorPosition());
int pos = int(textUnderCursor.toStdString().find_last_of(" .:()[]{}"));
size_t pos = textUnderCursor.toStdString().find_last_of(" .:()[]{}");
if (pos == std::string::npos)
pos = 0;
else
pos += 1;
QString fullText = text();
fullText.replace(pos, textUnderCursor.length() - pos, completitionString);
fullText.replace(int(pos), textUnderCursor.length() - int(pos), completitionString);
setText(fullText);
}
......
......@@ -178,11 +178,10 @@ namespace campvis {
if (itemName == "_G")
continue;
LuaTreeItem* lti = nullptr;
if (luaType == LUA_TTABLE)
lti = new LuaTreeItemTable(_modelStyle, false, thisTable->getTable(itemName), itemName, luaType, this);
new LuaTreeItemTable(_modelStyle, false, thisTable->getTable(itemName), itemName, luaType, this);
else
lti = new LuaTreeItemLeaf(_modelStyle, thisTable, itemName, luaType, this);
new LuaTreeItemLeaf(_modelStyle, thisTable, itemName, luaType, this);
}
}
else if (_modelStyle == COMPLETER_MODEL) {
......@@ -196,11 +195,10 @@ namespace campvis {
if (itemName == "_G")
continue;
LuaTreeItem* lti = nullptr;
if (luaType == LUA_TTABLE)
lti = new LuaTreeItemTable(_modelStyle, false, thisTable->getTable(itemName), itemName, luaType, this);
new LuaTreeItemTable(_modelStyle, false, thisTable->getTable(itemName), itemName, luaType, this);
else
lti = new LuaTreeItemLeaf(_modelStyle, thisTable, itemName, luaType, this);
new LuaTreeItemLeaf(_modelStyle, thisTable, itemName, luaType, this);
}
}
else {
......
......@@ -68,7 +68,7 @@ namespace campvis {
/// The Root Item
class CAMPVIS_APPLICATION_API LuaTreeRootItem : public TreeItem {
public:
LuaTreeRootItem(TreeItem* parent = 0);
explicit LuaTreeRootItem(TreeItem* parent = 0);
virtual ~LuaTreeRootItem();
/// \see TreeItem::getData()
......
......@@ -32,8 +32,8 @@ namespace campvis {
ScriptingWidget::ScriptingWidget(QWidget* parent)
: QWidget(parent)
, _consoleDisplay(nullptr)
, _editCommand(nullptr)
, _consoleDisplay(nullptr)
, _btnExecute(nullptr)
, _btnClear(nullptr)
, _currentPosition(-1)
......
......@@ -19,6 +19,10 @@
%}
%ignore ArgWithTypeInfoType;
%ignore argWithTypeInfoListCons;
%inline {
namespace sigslot {
......@@ -570,6 +574,24 @@ namespace sigslot {
++it;
}
}
void disconnectAllLuaSlots() {
typedef sigslot::_signal_base0::connections_list connections_list;
connections_list::iterator it = $self->m_connected_slots.begin();
connections_list::iterator itEnd = $self->m_connected_slots.end();
while (it != itEnd) {
sigslot::_lua_connection0<>* lua_connection =
dynamic_cast<sigslot::_lua_connection0<>*>(*it);
if (lua_connection != nullptr) {
delete lua_connection;
$self->m_connected_slots.erase(it);
}
++it;
}
}
}
};
......@@ -599,7 +621,6 @@ namespace sigslot {
*/
void disconnect(SWIGLUA_REF slot_fn) {
typedef sigslot::_signal_base1<arg1_type>::connections_list connections_list;
connections_list::iterator it = $self->m_connected_slots.begin();
connections_list::iterator itEnd = $self->m_connected_slots.end();
......@@ -616,6 +637,24 @@ namespace sigslot {
++it;
}
}
void disconnectAllLuaSlots() {
typedef sigslot::_signal_base1<arg1_type>::connections_list connections_list;
connections_list::iterator it = $self->m_connected_slots.begin();
connections_list::iterator itEnd = $self->m_connected_slots.end();
while (it != itEnd) {
sigslot::_lua_connection1<arg1_type>* lua_connection =
dynamic_cast<sigslot::_lua_connection1<arg1_type>*>(*it);
if (lua_connection != nullptr) {
delete lua_connection;
$self->m_connected_slots.erase(it);
}
++it;
}
}
}
};
......@@ -724,6 +763,24 @@ namespace sigslot {
++it;
}
}
void disconnectAllLuaSlots() {
typedef sigslot::_signal_base3<arg1_type, arg2_type, arg3_type>::connections_list connections_list;
connections_list::iterator it = $self->m_connected_slots.begin();
connections_list::iterator itEnd = $self->m_connected_slots.end();
while (it != itEnd) {
sigslot::_lua_connection3<arg1_type, arg2_type, arg3_type>* lua_connection =
dynamic_cast<sigslot::_lua_connection3<arg1_type, arg2_type, arg3_type>*>(*it);
if (lua_connection != nullptr) {
delete lua_connection;
$self->m_connected_slots.erase(it);
}
++it;
}
}
}
};
......@@ -769,6 +826,24 @@ namespace sigslot {
++it;
}
}
void disconnectAllLuaSlots() {
typedef sigslot::_signal_base4<arg1_type, arg2_type, arg3_type, arg4_type>::connections_list connections_list;
connections_list::iterator it = $self->m_connected_slots.begin();
connections_list::iterator itEnd = $self->m_connected_slots.end();
while (it != itEnd) {
sigslot::_lua_connection4<arg1_type, arg2_type, arg3_type, arg4_type>* lua_connection =
dynamic_cast<sigslot::_lua_connection4<arg1_type, arg2_type, arg3_type, arg4_type>*>(*it);
if (lua_connection != nullptr) {
delete lua_connection;
$self->m_connected_slots.erase(it);
}
++it;
}
}
}
};
......@@ -815,6 +890,25 @@ namespace sigslot {
++it;
}
}
void disconnectAllLuaSlots() {
typedef sigslot::_signal_base5<arg1_type, arg2_type, arg3_type, arg4_type, arg5_type>::connections_list connections_list;
connections_list::iterator it = $self->m_connected_slots.begin();
connections_list::iterator itEnd = $self->m_connected_slots.end();
while (it != itEnd) {
sigslot::_lua_connection5<arg1_type, arg2_type, arg3_type, arg4_type, arg5_type>* lua_connection =
dynamic_cast<sigslot::_lua_connection5<arg1_type, arg2_type, arg3_type, arg4_type,
arg5_type>*>(*it);
if (lua_connection != nullptr) {
delete lua_connection;
$self->m_connected_slots.erase(it);
}
++it;
}
}
}
};
}
......@@ -105,6 +105,8 @@ protected:
void execute() {
if (_pipeline != nullptr) {
sigslot::signal_manager::getRef().waitForSignalQueueFlushed();
for (size_t i = 0; i < _pipeline->getProcessors().size(); ++i)
_pipeline->executePipeline();
......@@ -115,6 +117,8 @@ protected:
_imageWriter.process(_dataContainer);
_wroteFile = cgt::FileSystem::fileExists(_fileName);
sigslot::signal_manager::getRef().waitForSignalQueueFlushed();
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment