diff options
| author |  Szymon Tomasz Stefanek | 2011-12-21 05:46:39 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2011-12-21 05:46:39 +0000 |
| commit | 5c56a0c42f15353fdf20b104b752f8e0d631929d (patch) | |
| tree | a626cd92f953b0a0f973937291601f8d08b29630 /src | |
| parent | Make $# work again (add missing files)... and this is commit 6000 :) (diff) | |
| download | KVIrc-5c56a0c42f15353fdf20b104b752f8e0d631929d.tar.gz KVIrc-5c56a0c42f15353fdf20b104b752f8e0d631929d.tar.bz2 KVIrc-5c56a0c42f15353fdf20b104b752f8e0d631929d.zip | |
Fix a memory leak
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6001 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/core/KviShortcut.cpp | 9 | ||||
| -rw-r--r-- | src/kvilib/core/KviShortcut.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/kvilib/core/KviShortcut.cpp b/src/kvilib/core/KviShortcut.cpp index d22f8f430..d3d93baf9 100644 --- a/src/kvilib/core/KviShortcut.cpp +++ b/src/kvilib/core/KviShortcut.cpp @@ -38,15 +38,16 @@ QShortcut * KviShortcut::create(const QKeySequence & key, QWidget * parent, cons return new QShortcut(key, parent, member, ambiguousMember, context); } -KviPointerList<QShortcut> * KviShortcut::create(QKeySequence::StandardKey key, QWidget * parent, const char * member, const char * ambiguousMember, Qt::ShortcutContext context) +void KviShortcut::create(QKeySequence::StandardKey key, QWidget * parent, const char * member, const char * ambiguousMember, Qt::ShortcutContext context,KviPointerList<QShortcut> * pBufferList) { QKeySequence singleKey; QList<QKeySequence> allKeys = QKeySequence::keyBindings(key); - KviPointerList<QShortcut> * allShortcuts = new KviPointerList<QShortcut>(); foreach(singleKey, allKeys) { //qDebug("New Multi Shortcut %s\n", singleKey.toString().toUtf8().data()); - allShortcuts->append(new QShortcut(singleKey, parent, member, ambiguousMember, context)); + QShortcut * pShortcut = new QShortcut(singleKey, parent, member, ambiguousMember, context); + if(pBufferList) + pBufferList->append(pShortcut); } - return allShortcuts; } + diff --git a/src/kvilib/core/KviShortcut.h b/src/kvilib/core/KviShortcut.h index fd1a37bb9..d7dbbea0d 100644 --- a/src/kvilib/core/KviShortcut.h +++ b/src/kvilib/core/KviShortcut.h @@ -41,7 +41,7 @@ private: public: static QShortcut * create(const char * key, QWidget * parent, const char * member = 0, const char * ambiguousMember = 0, Qt::ShortcutContext context = Qt::WindowShortcut); static QShortcut * create(const QKeySequence & key, QWidget * parent, const char * member = 0, const char * ambiguousMember = 0, Qt::ShortcutContext context = Qt::WindowShortcut); - static KviPointerList<QShortcut> * create(QKeySequence::StandardKey key, QWidget * parent, const char * member = 0, const char * ambiguousMember = 0, Qt::ShortcutContext context = Qt::WindowShortcut); + static void create(QKeySequence::StandardKey key, QWidget * parent, const char * member = 0, const char * ambiguousMember = 0, Qt::ShortcutContext context = Qt::WindowShortcut,KviPointerList<QShortcut> * pBufferList = NULL); }; #endif //_KVI_SHORTCUT_CLASSFILE_H_ |