diff options
| author |  staticfox | 2016-08-07 13:36:45 -0400 |
|---|---|---|
| committer | staticfox | 2016-08-07 23:12:47 -0400 |
| commit | f1523710eeaca04bfe95627877aa082b3b18c9c5 (patch) | |
| tree | 0408c7fa3eed019b5dccfb1b5bf9c6fe51d5cd0a /src | |
| parent | Links: Refactor links window and links widget (diff) | |
| download | KVIrc-f1523710eeaca04bfe95627877aa082b3b18c9c5.tar.gz KVIrc-f1523710eeaca04bfe95627877aa082b3b18c9c5.tar.bz2 KVIrc-f1523710eeaca04bfe95627877aa082b3b18c9c5.zip | |
proxywidget: More cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/options/OptionsWidget_proxy.cpp | 7 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_proxy.h | 1 | ||||
| -rw-r--r-- | src/modules/proxydb/libkviproxydb.cpp | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp index 52a8f63d1..e82c6fddf 100644 --- a/src/modules/options/OptionsWidget_proxy.cpp +++ b/src/modules/options/OptionsWidget_proxy.cpp @@ -44,6 +44,7 @@ #include <QMenu> #include <memory> +#include <utility> #include <vector> ProxyOptionsTreeWidgetItem::ProxyOptionsTreeWidgetItem(QTreeWidget * parent, const QPixmap & pm, KviProxy * prx) @@ -145,9 +146,6 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent) m_pContextPopup = new QMenu(this); } -OptionsWidget_proxy::~OptionsWidget_proxy() - = default; - void OptionsWidget_proxy::enableDisableUseProxySelector() { m_pUseProxySelector->setEnabled(m_pTreeWidget->currentItem()); @@ -320,10 +318,11 @@ void OptionsWidget_proxy::commit() if(!tmp.isEmpty()) { std::unique_ptr<KviProxy> prx(new KviProxy(*(it->m_pProxyData))); - g_pProxyDataBase->insertProxy(std::move(prx)); if(it == m_pLastEditedItem) g_pProxyDataBase->setCurrentProxy(prx.get()); + + g_pProxyDataBase->insertProxy(std::move(prx)); } } diff --git a/src/modules/options/OptionsWidget_proxy.h b/src/modules/options/OptionsWidget_proxy.h index 3b7b1f3f2..3ab01b3e0 100644 --- a/src/modules/options/OptionsWidget_proxy.h +++ b/src/modules/options/OptionsWidget_proxy.h @@ -62,7 +62,6 @@ class OptionsWidget_proxy : public KviOptionsWidget Q_OBJECT public: OptionsWidget_proxy(QWidget * parent); - ~OptionsWidget_proxy(); protected: QTreeWidget * m_pTreeWidget; diff --git a/src/modules/proxydb/libkviproxydb.cpp b/src/modules/proxydb/libkviproxydb.cpp index 6ccfc7634..bf95df93b 100644 --- a/src/modules/proxydb/libkviproxydb.cpp +++ b/src/modules/proxydb/libkviproxydb.cpp @@ -31,6 +31,9 @@ #include <QString> #include <QHostAddress> +#include <memory> +#include <utility> + extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; /* |