diff options
| author |  staticfox | 2016-08-07 10:33:51 -0400 |
|---|---|---|
| committer | staticfox | 2016-08-07 23:12:47 -0400 |
| commit | d02b835b4e04e6fc616b9bf3bc81bf7eb189e45c (patch) | |
| tree | 944df3beb1e0a816f6d398a27400f7cadd4d6662 /src/modules/term/TermWidget.cpp | |
| parent | serverwidget: Remove un-needed if checks (diff) | |
| download | KVIrc-d02b835b4e04e6fc616b9bf3bc81bf7eb189e45c.tar.gz KVIrc-d02b835b4e04e6fc616b9bf3bc81bf7eb189e45c.tar.bz2 KVIrc-d02b835b4e04e6fc616b9bf3bc81bf7eb189e45c.zip | |
libkviterm: Move to unordered_set
Diffstat (limited to 'src/modules/term/TermWidget.cpp')
| -rw-r--r-- | src/modules/term/TermWidget.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/modules/term/TermWidget.cpp b/src/modules/term/TermWidget.cpp index 60efec2e6..dfa1ac462 100644 --- a/src/modules/term/TermWidget.cpp +++ b/src/modules/term/TermWidget.cpp @@ -29,7 +29,6 @@ #include "KviMainWindow.h" #include "KviIconManager.h" #include "KviLocale.h" -#include "KviPointerList.h" #include <QLabel> #include <QToolTip> @@ -42,16 +41,18 @@ #include "kparts/factory.h" #include <kde_terminal_interface.h> +#include <unordered_set> + extern KviModule * g_pTermModule; -extern KviPointerList<TermWidget> * g_pTermWidgetList; -extern KviPointerList<TermWindow> * g_pTermWindowList; +extern std::unordered_set<TermWidget *> g_pTermWidgetList; +extern std::unordered_set<TermWindow *> g_pTermWindowList; TermWidget::TermWidget(QWidget * par, bool bIsStandalone) : QFrame(par) { setObjectName("term_widget"); if(bIsStandalone) - g_pTermWidgetList->append(this); + g_pTermWidgetList.insert(this); m_bIsStandalone = bIsStandalone; m_pKonsolePart = 0; @@ -112,8 +113,8 @@ TermWidget::~TermWidget() disconnect(m_pKonsoleWidget, SIGNAL(destroyed()), this, SLOT(konsoleDestroyed())); if(m_bIsStandalone) - g_pTermWidgetList->removeRef(this); - if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty()) + g_pTermWidgetList.erase(this); + if(g_pTermWindowList.erase() && g_pTermWidgetList.empty()) g_pTermModule->unlock(); } |