1 files changed, 31 insertions, 30 deletions

diff --git a/src/frontend/searchdialog/btsearchoptionsarea.cpp b/src/frontend/searchdialog/btsearchoptionsarea.cpp
index d6c3b4f..95c9218 100644
--- a/src/frontend/searchdialog/btsearchoptionsarea.cpp
+++ b/src/frontend/searchdialog/btsearchoptionsarea.cpp
@@ -7,28 +7,27 @@
 *
 **********/
 
-#include "btsearchoptionsarea.h"
-#include "csearchmodulechooserdialog.h"
-#include "crangechooserdialog.h"
+#include "frontend/searchdialog/btsearchoptionsarea.h"
 
-#include "util/directoryutil.h"
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-#include "util/cpointers.h"
-#include "backend/drivers/cswordmoduleinfo.h"
-#include "backend/config/cbtconfig.h"
-#include "frontend/htmldialogs/bttabhtmldialog.h"
-
-#include <QHBoxLayout>
-#include <QGroupBox>
+#include <QDebug>
+#include <QEvent>
 #include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLabel>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QDebug>
 #include <QLineEdit>
 #include <QMessageBox>
-#include <QEvent>
+#include <QPushButton>
+#include <QRadioButton>
+#include "backend/config/cbtconfig.h"
+#include "backend/drivers/cswordmoduleinfo.h"
+#include "frontend/htmldialogs/bttabhtmldialog.h"
+#include "frontend/searchdialog/crangechooserdialog.h"
+#include "frontend/searchdialog/csearchmodulechooserdialog.h"
+#include "util/cpointers.h"
+#include "util/cresmgr.h"
+#include "util/tool.h"
+#include "util/directory.h"
 
 
 namespace Search {
@@ -83,6 +82,8 @@ void BtSearchOptionsArea::setSearchText(const QString& text) {
 }
 
 void BtSearchOptionsArea::initView() {
+    namespace DU = util::directory;
+
     QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     this->setSizePolicy(sizePolicy);
     hboxLayout = new QHBoxLayout(this);
@@ -102,17 +103,17 @@ void BtSearchOptionsArea::initView() {
 
     m_searchButton = new QPushButton(this);
     m_searchButton->setText(tr("&Search"));
-    m_searchButton->setIcon( util::filesystem::DirectoryUtil::getIcon(CResMgr::searchdialog::icon));
+    m_searchButton->setIcon(DU::getIcon(CResMgr::searchdialog::icon));
     m_searchButton->setToolTip(tr("Start to search the text in the chosen works"));
     gridLayout->addWidget(m_searchButton, 0, 2);
 
     m_chooseModulesButton = new QPushButton(tr("Ch&oose..."), searchGroupBox);
-    m_chooseModulesButton->setIcon(util::filesystem::DirectoryUtil::getIcon(CResMgr::searchdialog::chooseworks_icon));
+    m_chooseModulesButton->setIcon(DU::getIcon(CResMgr::searchdialog::chooseworks_icon));
     m_chooseModulesButton->setToolTip( tr("Choose works for the search"));
     gridLayout->addWidget(m_chooseModulesButton, 2, 2);
 
     m_chooseRangeButton = new QPushButton(tr("S&etup..."), searchGroupBox);
-    m_chooseRangeButton->setIcon(util::filesystem::DirectoryUtil::getIcon(CResMgr::searchdialog::setupscope_icon));
+    m_chooseRangeButton->setIcon(DU::getIcon(CResMgr::searchdialog::setupscope_icon));
     m_chooseRangeButton->setToolTip(tr("Configure predefined scopes for search"));
     gridLayout->addWidget(m_chooseRangeButton, 3, 2);
 
@@ -121,10 +122,10 @@ void BtSearchOptionsArea::initView() {
     int tsLeft, tsTop, tsRight, tsBottom;
     // Added space looks nicer and enhances readability
     typeSelectorLayout->getContentsMargins(&tsLeft, &tsTop, &tsRight, &tsBottom);
-    typeSelectorLayout->setContentsMargins(tsLeft, 0, tsRight, tsBottom + CToolClass::mWidth(this, 1) );
-    typeSelectorLayout->setSpacing(typeSelectorLayout->spacing() + CToolClass::mWidth(this, 1));
+    typeSelectorLayout->setContentsMargins(tsLeft, 0, tsRight, tsBottom + util::tool::mWidth(this, 1) );
+    typeSelectorLayout->setSpacing(typeSelectorLayout->spacing() + util::tool::mWidth(this, 1));
     QHBoxLayout* fullButtonLayout = new QHBoxLayout();
-    fullButtonLayout->setSpacing(CToolClass::mWidth(this, 1) / 2);
+    fullButtonLayout->setSpacing(util::tool::mWidth(this, 1) / 2);
     m_typeAndButton = new QRadioButton(tr("All words"));
     m_typeAndButton->setChecked(true);
     m_typeOrButton = new QRadioButton(tr("Some words"));
@@ -204,7 +205,7 @@ void BtSearchOptionsArea::initConnections() {
 
 /** Sets the modules used by the search. */
 void BtSearchOptionsArea::setModules( QList<CSwordModuleInfo*> modules ) {
-    qDebug("BtSearchOptionsArea::setModules");
+    qDebug() << "BtSearchOptionsArea::setModules";
     qDebug() << modules;
     QString t;
 
@@ -212,7 +213,7 @@ void BtSearchOptionsArea::setModules( QList<CSwordModuleInfo*> modules ) {
     QList<CSwordModuleInfo*>::iterator end_it = modules.end();
 
     for (QList<CSwordModuleInfo*>::iterator it(modules.begin()); it != end_it; ++it) {
-        //ToDo:  Check for containsRef compat
+        /// \todo Check for containsRef compat
         if (*it == 0) { //don't operate on null modules.
             continue;
         }
@@ -245,12 +246,12 @@ void BtSearchOptionsArea::setModules( QList<CSwordModuleInfo*> modules ) {
         historyList.append(m_modulesCombo->itemText(i));
     }
     CBTConfig::set(CBTConfig::searchModulesHistory, historyList);
-    emit( sigSetSearchButtonStatus( (modules.count() != 0) ) );
+    emit sigSetSearchButtonStatus(modules.count() != 0);
 }
 
 // Catch activated signal of module selector combobox
 void BtSearchOptionsArea::moduleListTextSelected(int index) {
-    qDebug("BtSearchOptionsArea::moduleListTextSelected");
+    qDebug() << "BtSearchOptionsArea::moduleListTextSelected";
     //create the module list
     QString text = m_modulesCombo->itemText(index);
     qDebug() << text;
@@ -441,7 +442,7 @@ void BtSearchOptionsArea::refreshRanges() {
     //the first option is fixed, the others can be edited using the "Setup ranges" button.
     m_rangeChooserCombo->clear();
     m_rangeChooserCombo->insertItem(0, QString("[") + tr("No search scope") + QString("]"));
-    //TODO: what about this?
+    /// \todo what about this?
     //m_rangeChooserCombo->insertItem(tr("Last search result"));
 
     //insert the user-defined ranges
@@ -469,7 +470,7 @@ void BtSearchOptionsArea::addToHistory(const QString& text) {
 }
 
 void BtSearchOptionsArea::slotSearchTextEditReturnPressed() {
-    qDebug("BtSearchOptionsArea::slotSearchTextEditReturnPressed");
+    qDebug() << "BtSearchOptionsArea::slotSearchTextEditReturnPressed";
     m_searchTextCombo->addToHistory( m_searchTextCombo->currentText() );
     emit sigStartSearch();
 }
@@ -502,7 +503,7 @@ void BtSearchOptionsArea::slotValidateText(const QString& /*newText*/) {
 // 		}
 // 	}
 // 	else {
-// 		qDebug("AND/OR!");
+// 		qDebug() << "AND/OR!";
 // 		if (m_typeAndButton->isEnabled()) {
 // 			m_typeOrButton->setChecked(true);
 // 			m_typeOrButton->setEnabled(false);