diff options
| author |  un1versal | 2016-04-06 06:55:55 +0100 |
|---|---|---|
| committer | un1versal | 2016-04-06 13:28:00 +0100 |
| commit | 8bb78d2b0611f8ca3a4053160fdd7fec97c7e64e (patch) | |
| tree | e00219dbe9c716b8314b520f434b2025308980b9 | |
| parent | Merge pull request #1920 from TheReign/master (diff) | |
| download | KVIrc-8bb78d2b0611f8ca3a4053160fdd7fec97c7e64e.tar.gz KVIrc-8bb78d2b0611f8ca3a4053160fdd7fec97c7e64e.tar.bz2 KVIrc-8bb78d2b0611f8ca3a4053160fdd7fec97c7e64e.zip | |
KviMenuBar: fix indenting part 2 after 70e29e4
| -rw-r--r-- | src/kvirc/ui/KviMenuBar.cpp | 5 | ||||
| -rw-r--r-- | src/kvirc/ui/KviMenuBar.h | 28 |
2 files changed, 16 insertions, 17 deletions
diff --git a/src/kvirc/ui/KviMenuBar.cpp b/src/kvirc/ui/KviMenuBar.cpp index c4bf57408..d163975aa 100644 --- a/src/kvirc/ui/KviMenuBar.cpp +++ b/src/kvirc/ui/KviMenuBar.cpp @@ -232,9 +232,8 @@ void KviMenuBar::setupScriptingPopup(QMenu *pop) void KviMenuBar::updateMainPopup() { m_pDisconnectAction->setEnabled( - m_pFrm->activeContext() && - m_pFrm->activeContext()->state() == KviIrcContext::Connected - ); + m_pFrm->activeContext() && + m_pFrm->activeContext()->state() == KviIrcContext::Connected); } void KviMenuBar::setupMainPopup(QMenu *pop) diff --git a/src/kvirc/ui/KviMenuBar.h b/src/kvirc/ui/KviMenuBar.h index 3d20fb619..372a7766c 100644 --- a/src/kvirc/ui/KviMenuBar.h +++ b/src/kvirc/ui/KviMenuBar.h @@ -36,9 +36,9 @@ class KviKvsPopupMenu; typedef struct _KviScriptMenuBarItem { - KviCString szPopupName; - KviKvsPopupMenu * pPopup; - KviCString szText; + KviCString szPopupName; + KviKvsPopupMenu * pPopup; + KviCString szText; } KviScriptMenuBarItem; @@ -49,18 +49,18 @@ public: KviMenuBar(KviMainWindow * par,const char * name); ~KviMenuBar(); protected: - QMenu * m_pToolbarsPopup; - QMenu * m_pRecentServersPopup; - KviMainWindow * m_pFrm; - QMenu * m_pModulesToolsPopup; - QMenu * m_pActionsToolsPopup; - KviPointerList<KviScriptMenuBarItem> * m_pScriptItemList; + QMenu * m_pToolbarsPopup; + QMenu * m_pRecentServersPopup; + KviMainWindow * m_pFrm; + QMenu * m_pModulesToolsPopup; + QMenu * m_pActionsToolsPopup; + KviPointerList<KviScriptMenuBarItem> * m_pScriptItemList; // Dynamic actions - QAction * m_pMenuBarAction; - QAction * m_pStatusBarAction; - QAction * m_pDisconnectAction; - QAction * m_pModulesToolsAction; - QAction * m_pActionsToolsAction; + QAction * m_pMenuBarAction; + QAction * m_pStatusBarAction; + QAction * m_pDisconnectAction; + QAction * m_pModulesToolsAction; + QAction * m_pActionsToolsAction; protected: KviScriptMenuBarItem * findMenu(const QString &text); KviScriptMenuBarItem * findMenu(KviKvsPopupMenu * p); |