From 5de7c36c8f578b218fa13a5f8ccceca99c02695d Mon Sep 17 00:00:00 2001 From: Arin Alex Date: Thu, 3 Mar 2016 03:08:36 +0300 Subject: [PATCH] PreviewReportWindow & SettingDialog have been moved to LimeReport namespace --- src/lrpreviewreportwindow.cpp | 3 +++ src/lrpreviewreportwindow.h | 5 +++-- src/lrsettingdialog.cpp | 4 ++++ src/lrsettingdialog.h | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/lrpreviewreportwindow.cpp b/src/lrpreviewreportwindow.cpp index 5a60f9f..e024d28 100644 --- a/src/lrpreviewreportwindow.cpp +++ b/src/lrpreviewreportwindow.cpp @@ -39,6 +39,8 @@ #include #include +namespace LimeReport{ + PreviewReportWindow::PreviewReportWindow(ReportEnginePrivate *report,QWidget *parent, QSettings *settings, Qt::WindowFlags flags) : QMainWindow(parent,flags), ui(new Ui::PreviewReportWindow), m_currentPage(1), m_changingPage(false), m_settings(settings), m_ownedSettings(false), @@ -441,3 +443,4 @@ void PreviewReportWindow::slotSliderMoved(int value) } +}// namespace LimeReport diff --git a/src/lrpreviewreportwindow.h b/src/lrpreviewreportwindow.h index 0033201..48f1742 100644 --- a/src/lrpreviewreportwindow.h +++ b/src/lrpreviewreportwindow.h @@ -42,7 +42,8 @@ namespace Ui { class PreviewReportWindow; } -using namespace LimeReport; +//using namespace LimeReport; +namespace LimeReport { class PreviewReportWindow : public QMainWindow { Q_OBJECT @@ -94,5 +95,5 @@ private: bool m_ownedSettings; int m_priorScrolValue; }; - +} //namespace LimeReport #endif // LRPREVIEWREPORTWINDOW_H diff --git a/src/lrsettingdialog.cpp b/src/lrsettingdialog.cpp index b02b2f0..15a86c5 100644 --- a/src/lrsettingdialog.cpp +++ b/src/lrsettingdialog.cpp @@ -1,6 +1,8 @@ #include "lrsettingdialog.h" #include "ui_lrsettingdialog.h" +namespace LimeReport{ + SettingDialog::SettingDialog(QWidget *parent) : QDialog(parent), ui(new Ui::SettingDialog) @@ -45,3 +47,5 @@ void SettingDialog::setDefaultFont(const QFont &value) ui->defaultFont->setCurrentFont(value); ui->defaultFontSize->setValue(value.pointSize()); } + +} // namespace LimeReport diff --git a/src/lrsettingdialog.h b/src/lrsettingdialog.h index 053c1c9..4b82fbe 100644 --- a/src/lrsettingdialog.h +++ b/src/lrsettingdialog.h @@ -7,6 +7,7 @@ namespace Ui { class SettingDialog; } +namespace LimeReport{ class SettingDialog : public QDialog { Q_OBJECT @@ -23,5 +24,6 @@ public: private: Ui::SettingDialog *ui; }; +} // namespace LimeReport #endif // LRSETTINGDIALOG_H