diff options
| author |  Fabio Bas | 2012-02-26 14:57:49 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-02-26 14:57:49 +0000 |
| commit | b2891fe17c395b885b4fac8634fa8cca1a45fbb6 (patch) | |
| tree | e9fcfdebc14137188b3cf02376fe90145d52943d /src/modules/options/OptionsWidget_proxy.h | |
| parent | Some mixed changes, mostly related to osx development: (diff) | |
| download | KVIrc-b2891fe17c395b885b4fac8634fa8cca1a45fbb6.tar.gz KVIrc-b2891fe17c395b885b4fac8634fa8cca1a45fbb6.tar.bz2 KVIrc-b2891fe17c395b885b4fac8634fa8cca1a45fbb6.zip | |
Dropped the KviTalPopupMenu layer, ported the involved code to QAction.
This fixes most of the random crashes on osx, and is the base for a next change in the menubar.
Addiotional fix: "disconnect" menu entry was broken since the 3.x era
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6072 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options/OptionsWidget_proxy.h')
| -rw-r--r-- | src/modules/options/OptionsWidget_proxy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/options/OptionsWidget_proxy.h b/src/modules/options/OptionsWidget_proxy.h index 429bd7bf9..930cfda29 100644 --- a/src/modules/options/OptionsWidget_proxy.h +++ b/src/modules/options/OptionsWidget_proxy.h @@ -34,7 +34,7 @@ class QLabel; class QLineEdit; class QComboBox; class KviIpEditor; -class KviTalPopupMenu; +class QMenu; class KviProxy; class KviProxyDataBase; @@ -76,7 +76,7 @@ protected: QLineEdit * m_pPortEdit; QLabel * m_pProtocolLabel; QComboBox * m_pProtocolBox; - KviTalPopupMenu * m_pContextPopup; + QMenu * m_pContextPopup; QCheckBox * m_pIPv6Check; ProxyOptionsTreeWidgetItem * m_pLastEditedItem; private: |