summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e7352d2)
Explicitly delete a freshly created BufferViewConfig in case it cannot
be added, rather than relying on QObject parentship - clang-tidy
warns about that. I'm rather sure that this is a false positive, but
better safe than sorry.
Simplify and clean-up related code a bit.
-void BufferViewManager::addBufferViewConfig(BufferViewConfig *config)
+void BufferViewManager::addBufferViewConfig(int bufferViewConfigId)
- if (_bufferViewConfigs.contains(config->bufferViewId()))
+ if (_bufferViewConfigs.contains(bufferViewConfigId)) {
- _proxy->synchronize(config);
- _bufferViewConfigs[config->bufferViewId()] = config;
- int bufferViewId = config->bufferViewId();
- SYNC_OTHER(addBufferViewConfig, ARG(bufferViewId))
- emit bufferViewConfigAdded(bufferViewId);
+ addBufferViewConfig(bufferViewConfigFactory(bufferViewConfigId));
-void BufferViewManager::addBufferViewConfig(int bufferViewConfigId)
+void BufferViewManager::addBufferViewConfig(BufferViewConfig *config)
- if (_bufferViewConfigs.contains(bufferViewConfigId))
+ if (_bufferViewConfigs.contains(config->bufferViewId())) {
+ delete config;
- addBufferViewConfig(bufferViewConfigFactory(bufferViewConfigId));
+ _proxy->synchronize(config);
+ _bufferViewConfigs[config->bufferViewId()] = config;
+ int bufferViewId = config->bufferViewId();
+ SYNC_OTHER(addBufferViewConfig, ARG(bufferViewId))
+ emit bufferViewConfigAdded(bufferViewId);
void BufferViewManager::initSetBufferViewIds(const QVariantList bufferViewIds)
{
void BufferViewManager::initSetBufferViewIds(const QVariantList bufferViewIds)
{
- QVariantList::const_iterator iter = bufferViewIds.constBegin();
- QVariantList::const_iterator iterEnd = bufferViewIds.constEnd();
- while (iter != iterEnd) {
- newBufferViewConfig((*iter).value<int>());
- ++iter;
+ for (auto &&id : bufferViewIds) {
+ addBufferViewConfig(id.value<int>());
BufferViewConfig *bufferViewConfig(int bufferViewId) const;
public slots:
BufferViewConfig *bufferViewConfig(int bufferViewId) const;
public slots:
- void addBufferViewConfig(BufferViewConfig *config);
- void addBufferViewConfig(int bufferViewConfigId);
- inline void newBufferViewConfig(int bufferViewConfigId) { addBufferViewConfig(bufferViewConfigId); }
-
- void deleteBufferViewConfig(int bufferViewConfigId);
-
QVariantList initBufferViewIds() const;
void initSetBufferViewIds(const QVariantList bufferViewIds);
QVariantList initBufferViewIds() const;
void initSetBufferViewIds(const QVariantList bufferViewIds);
inline const BufferViewConfigHash &bufferViewConfigHash() { return _bufferViewConfigs; }
virtual BufferViewConfig *bufferViewConfigFactory(int bufferViewConfigId);
inline const BufferViewConfigHash &bufferViewConfigHash() { return _bufferViewConfigs; }
virtual BufferViewConfig *bufferViewConfigFactory(int bufferViewConfigId);
+ void addBufferViewConfig(BufferViewConfig *config);
+ void addBufferViewConfig(int bufferViewConfigId);
+ void deleteBufferViewConfig(int bufferViewConfigId);
+
private:
BufferViewConfigHash _bufferViewConfigs;
SignalProxy *_proxy;
private:
BufferViewConfigHash _bufferViewConfigs;
SignalProxy *_proxy;
- CoreBufferViewConfig *config = new CoreBufferViewConfig(maxId, properties);
- addBufferViewConfig(config);
+ addBufferViewConfig(new CoreBufferViewConfig(maxId, properties, this));