1 files changed, 10 insertions, 16 deletions
diff --git a/src/frontend/displaywindow/cbuttons.cpp b/src/frontend/displaywindow/cbuttons.cpp
index fbe2443..46c262a 100644
--- a/src/frontend/displaywindow/cbuttons.cpp
+++ b/src/frontend/displaywindow/cbuttons.cpp
@@ -7,29 +7,24 @@
 *
 **********/
 
-//BibleTime includes
-#include "cbuttons.h"
+#include "frontend/displaywindow/cbuttons.h"
 
-#include "util/cresmgr.h"
-#include "util/cpointers.h"
-#include "util/directoryutil.h"
-
-//Qt includes
+#include <QHash>
+#include <QMenu>
 #include <QString>
 #include <QToolTip>
 #include <QToolButton>
-#include <QHash>
-#include <QMenu>
-
-//KDE includes
-
-
+#include "util/directory.h"
+#include "util/cpointers.h"
+#include "util/cresmgr.h"
 
 
 CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const QList<CSwordModuleInfo*>& useModules, QWidget *parent )
         : QToolButton(parent) {
+    namespace DU = util::directory;
+
     //  qWarning("CDisplaySettingsButton::CDisplaySettingsButton");
-    QToolButton::setIcon(util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::displaySettings::icon));
+    QToolButton::setIcon(DU::getIcon(CResMgr::displaywindows::displaySettings::icon));
 
     m_displaySettings = displaySettings;
     m_moduleSettings = moduleSettings;
@@ -60,7 +55,6 @@ void CDisplaySettingsButton::reset(const QList<CSwordModuleInfo*>& useModules) {
 
 
 void CDisplaySettingsButton::optionToggled(QAction* /*action*/) {
-    qDebug("display settings option toggled");
     //Take each Action and set the corresponding setting.
     //Using QAction (QObject) property and OptionType enum is a dirty way to do this.
     //See populateMenu().
@@ -187,5 +181,5 @@ bool CDisplaySettingsButton::itemStatus( const int index ) {
 
 /** Sets the status to changed. The signal changed will be emitted. */
 void CDisplaySettingsButton::setChanged() {
-    emit sigChanged();
+    optionToggled(0);
 }