diff options
author | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:31 -0400 |
---|---|---|
committer | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:31 -0400 |
commit | 294b5ec5834affa57641475946b8d2aeca53c577 (patch) | |
tree | ca25b634d0f24ab5b1fc38eb805e72e0e993e0f1 /src/frontend/displaywindow/cmodulechooserbutton.cpp | |
parent | e8a196082586bb68e0bf254a8f6f4b8f39071f32 (diff) |
Imported Upstream version 2.4
Diffstat (limited to 'src/frontend/displaywindow/cmodulechooserbutton.cpp')
-rw-r--r-- | src/frontend/displaywindow/cmodulechooserbutton.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/frontend/displaywindow/cmodulechooserbutton.cpp b/src/frontend/displaywindow/cmodulechooserbutton.cpp index 14760e0..0444cf6 100644 --- a/src/frontend/displaywindow/cmodulechooserbutton.cpp +++ b/src/frontend/displaywindow/cmodulechooserbutton.cpp @@ -7,33 +7,31 @@ * **********/ -#include "cmodulechooserbutton.h" - -#include "cmodulechooserbar.h" - -#include "backend/managers/cswordbackend.h" +#include "frontend/displaywindow/cmodulechooserbutton.h" +#include <QDebug> +#include <QHash> +#include <QMenu> +#include <QString> +#include <QToolButton> +#include <QToolTip> #include "backend/config/cbtconfig.h" - +#include "backend/managers/cswordbackend.h" +#include "frontend/displaywindow/cmodulechooserbar.h" #include "util/cresmgr.h" -#include "util/directoryutil.h" +#include "util/directory.h" -//Qt includes -#include <QString> -#include <QToolTip> -#include <QHash> -#include <QToolButton> -#include <QMenu> -#include <QtDebug> CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule, CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent) : QToolButton(parent), m_id(id), m_popup(0), m_moduleChooserBar(parent) { + namespace DU = util::directory; + m_moduleType = type; m_module = useModule; m_hasModule = (m_module) ? true : false; - setIcon( util::filesystem::DirectoryUtil::getIcon(iconName()) ); + setIcon(DU::getIcon(iconName())); setPopupMode(QToolButton::InstantPopup); populateMenu(); @@ -81,6 +79,7 @@ int CModuleChooserButton::getId() const { /** Is called after a module was selected in the popup */ void CModuleChooserButton::moduleChosen( QAction* action ) { + namespace DU = util::directory; QListIterator<QMenu*> it(m_submenus); while (it.hasNext()) { @@ -106,7 +105,7 @@ void CModuleChooserButton::moduleChosen( QAction* action ) { m_hasModule = true; m_module = module(); - setIcon( util::filesystem::DirectoryUtil::getIcon(iconName()) ); + setIcon(DU::getIcon(iconName())); emit sigChanged(); if (m_module) { |