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/settingsdialogs/cdisplaysettings.cpp | |
| parent | e8a196082586bb68e0bf254a8f6f4b8f39071f32 (diff) | |
Imported Upstream version 2.4
Diffstat (limited to 'src/frontend/settingsdialogs/cdisplaysettings.cpp')
| -rw-r--r-- | src/frontend/settingsdialogs/cdisplaysettings.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/frontend/settingsdialogs/cdisplaysettings.cpp b/src/frontend/settingsdialogs/cdisplaysettings.cpp index e34eb8b..9341632 100644 --- a/src/frontend/settingsdialogs/cdisplaysettings.cpp +++ b/src/frontend/settingsdialogs/cdisplaysettings.cpp @@ -7,21 +7,20 @@ * **********/ -#include "cdisplaysettings.h" +#include "frontend/settingsdialogs/cdisplaysettings.h" +#include <QCheckBox> +#include <QComboBox> +#include <QLabel> +#include <QVBoxLayout> +#include <QWebView> #include "backend/config/cbtconfig.h" -#include "backend/rendering/cdisplayrendering.h" #include "backend/managers/cdisplaytemplatemgr.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" +#include "backend/rendering/cdisplayrendering.h" #include "util/cpointers.h" +#include "util/cresmgr.h" +#include "util/tool.h" -#include <QWebView> -#include <QCheckBox> -#include <QComboBox> -#include <QVBoxLayout> -#include <QLabel> // *********************** // Container for QWebView to control its size @@ -60,7 +59,7 @@ CDisplaySettingsPage::CDisplaySettingsPage(QWidget* /*parent*/) layout->addSpacing(20); layout->addWidget( - CToolClass::explanationLabel( + util::tool::explanationLabel( this, tr("Display templates"), tr("Display templates define how text is displayed.") @@ -107,7 +106,7 @@ CDisplaySettingsPage::CDisplaySettingsPage(QWidget* /*parent*/) void CDisplaySettingsPage::updateStylePreview() { //update the style preview widget - qDebug("CDisplaySettingsPage::updateStylePreview"); + qDebug() << "CDisplaySettingsPage::updateStylePreview"; using namespace Rendering; const QString styleName = m_styleChooserCombo->currentText(); @@ -162,7 +161,7 @@ void CDisplaySettingsPage::updateStylePreview() { CBTConfig::set (CBTConfig::displayStyle, oldStyleName); - qDebug("CDisplaySettingsPage::updateStylePreview end"); + qDebug() << "CDisplaySettingsPage::updateStylePreview end"; } void CDisplaySettingsPage::save() { |