diff --git a/src/databrowser/lrconnectiondialog.cpp b/src/databrowser/lrconnectiondialog.cpp
index 99dc3b1..52ce1b8 100644
--- a/src/databrowser/lrconnectiondialog.cpp
+++ b/src/databrowser/lrconnectiondialog.cpp
@@ -37,6 +37,8 @@
 #include <stdexcept>
 #include <QFileDialog>
 
+namespace LimeReport{
+
 ConnectionDialog::ConnectionDialog(LimeReport::IConnectionController *conControl, LimeReport::ConnectionDesc* connectionDesc, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::ConnectionDialog),m_connection(connectionDesc),m_controller(conControl)
@@ -147,3 +149,5 @@ void ConnectionDialog::on_toolButton_clicked()
 {
     ui->leDataBase->setText(QFileDialog::getOpenFileName());
 }
+
+} // namespace LimeReport
diff --git a/src/databrowser/lrconnectiondialog.h b/src/databrowser/lrconnectiondialog.h
index 8dbf30b..acc86a5 100644
--- a/src/databrowser/lrconnectiondialog.h
+++ b/src/databrowser/lrconnectiondialog.h
@@ -33,6 +33,8 @@
 #include <QDialog>
 #include "lrdatadesignintf.h"
 
+namespace LimeReport{
+
 namespace Ui {
     class ConnectionDialog;
 }
@@ -63,4 +65,6 @@ private:
     LimeReport::IConnectionController* m_controller;
 };
 
+} // namespace LimeReport
+
 #endif // LRCONNECTIONDIALOG_H
diff --git a/src/databrowser/lrconnectiondialog.ui b/src/databrowser/lrconnectiondialog.ui
index b292cf5..49525ec 100644
--- a/src/databrowser/lrconnectiondialog.ui
+++ b/src/databrowser/lrconnectiondialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ConnectionDialog</class>
- <widget class="QDialog" name="ConnectionDialog">
+ <class>LimeReport::ConnectionDialog</class>
+ <widget class="QDialog" name="LimeReport::ConnectionDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -196,7 +196,7 @@
   <connection>
    <sender>pbOk</sender>
    <signal>clicked()</signal>
-   <receiver>ConnectionDialog</receiver>
+   <receiver>LimeReport::ConnectionDialog</receiver>
    <slot>slotAccept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -212,7 +212,7 @@
   <connection>
    <sender>pbCancel</sender>
    <signal>clicked()</signal>
-   <receiver>ConnectionDialog</receiver>
+   <receiver>LimeReport::ConnectionDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -228,7 +228,7 @@
   <connection>
    <sender>pbCheckConnection</sender>
    <signal>clicked()</signal>
-   <receiver>ConnectionDialog</receiver>
+   <receiver>LimeReport::ConnectionDialog</receiver>
    <slot>slotCheckConnection()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/databrowser/lrdatabrowser.h b/src/databrowser/lrdatabrowser.h
index 11a489a..4aa9de8 100644
--- a/src/databrowser/lrdatabrowser.h
+++ b/src/databrowser/lrdatabrowser.h
@@ -38,10 +38,11 @@
 #include "lrreportdesignwidget.h"
 #include "lrsqleditdialog.h"
 
+namespace LimeReport{
+
 namespace Ui {
     class DataBrowser;
 }
-namespace LimeReport{
 
 class DataBrowser : public QWidget, public IConnectionController
 {
diff --git a/src/databrowser/lrdatabrowser.ui b/src/databrowser/lrdatabrowser.ui
index 6985bf0..26e070a 100644
--- a/src/databrowser/lrdatabrowser.ui
+++ b/src/databrowser/lrdatabrowser.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DataBrowser</class>
- <widget class="QWidget" name="DataBrowser">
+ <class>LimeReport::DataBrowser</class>
+ <widget class="QWidget" name="LimeReport::DataBrowser">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/databrowser/lrdatabrowsertree.cpp b/src/databrowser/lrdatabrowsertree.cpp
index a7c06ad..e5d8d79 100644
--- a/src/databrowser/lrdatabrowsertree.cpp
+++ b/src/databrowser/lrdatabrowsertree.cpp
@@ -31,6 +31,8 @@
 #include <QDebug>
 #include <QMimeData>
 
+namespace LimeReport {
+
 DataBrowserTree::DataBrowserTree(QWidget *parent) :
     QTreeWidget(parent){}
 
@@ -45,3 +47,5 @@ QMimeData *DataBrowserTree::mimeData(const QList<QTreeWidgetItem *> items) const
     }
     return result;
 }
+
+} // namespace LimeReport
diff --git a/src/databrowser/lrdatabrowsertree.h b/src/databrowser/lrdatabrowsertree.h
index 1a44eb5..9cce57f 100644
--- a/src/databrowser/lrdatabrowsertree.h
+++ b/src/databrowser/lrdatabrowsertree.h
@@ -32,6 +32,9 @@
 
 #include <QTreeWidget>
 
+namespace LimeReport{
+
+
 class DataBrowserTree : public QTreeWidget
 {
     Q_OBJECT
@@ -45,4 +48,6 @@ public slots:
 
 };
 
+} // namespace LimeReport
+
 #endif // LRDATABROWSERTREE_H
diff --git a/src/databrowser/lrsqleditdialog.cpp b/src/databrowser/lrsqleditdialog.cpp
index 395ffed..ef292a8 100644
--- a/src/databrowser/lrsqleditdialog.cpp
+++ b/src/databrowser/lrsqleditdialog.cpp
@@ -35,6 +35,8 @@
 #include <QSqlDatabase>
 #include <QMessageBox>
 
+namespace LimeReport{
+
 SQLEditDialog::SQLEditDialog(QWidget *parent, LimeReport::DataSourceManager *dataSources, SQLDialogMode dialogMode) :
     QDialog(parent),
     ui(new Ui::SQLEditDialog),m_datasources(dataSources),m_dialogMode(dialogMode), m_oldDatasourceName(""),
@@ -341,3 +343,4 @@ void SQLEditDialog::hidePreview()
     ui->pbHidePreview->setVisible(false);
 }
 
+} // namespace LimeReport
diff --git a/src/databrowser/lrsqleditdialog.h b/src/databrowser/lrsqleditdialog.h
index 8122824..269f3f4 100644
--- a/src/databrowser/lrsqleditdialog.h
+++ b/src/databrowser/lrsqleditdialog.h
@@ -38,6 +38,8 @@
 #include "lrdatasourcemanager.h"
 #include "lrdatadesignintf.h"
 
+namespace LimeReport{
+
 namespace Ui {
     class SQLEditDialog;
 }
@@ -106,4 +108,6 @@ struct SQLEditResult{
     QList<LimeReport::FieldsCorrelation> fieldMap;
 };
 
+} // namespace LimeReport
+
 #endif // LRSQLEDITDIALOG_H
diff --git a/src/databrowser/lrsqleditdialog.ui b/src/databrowser/lrsqleditdialog.ui
index 9e9116c..e1353aa 100644
--- a/src/databrowser/lrsqleditdialog.ui
+++ b/src/databrowser/lrsqleditdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>SQLEditDialog</class>
- <widget class="QDialog" name="SQLEditDialog">
+ <class>LimeReport::SQLEditDialog</class>
+ <widget class="QDialog" name="LimeReport::SQLEditDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -807,7 +807,7 @@
   <connection>
    <sender>leDatasourceName</sender>
    <signal>textChanged(QString)</signal>
-   <receiver>SQLEditDialog</receiver>
+   <receiver>LimeReport::SQLEditDialog</receiver>
    <slot>slotDataSourceNameEditing()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -823,7 +823,7 @@
   <connection>
    <sender>pushButton</sender>
    <signal>clicked()</signal>
-   <receiver>SQLEditDialog</receiver>
+   <receiver>LimeReport::SQLEditDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -839,7 +839,7 @@
   <connection>
    <sender>pushButton_2</sender>
    <signal>clicked()</signal>
-   <receiver>SQLEditDialog</receiver>
+   <receiver>LimeReport::SQLEditDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/items/lrsimpletagparser.cpp b/src/items/lrsimpletagparser.cpp
index 128cb8c..e0899f3 100644
--- a/src/items/lrsimpletagparser.cpp
+++ b/src/items/lrsimpletagparser.cpp
@@ -33,6 +33,7 @@
 #include <QStringList>
 
 namespace LimeReport{
+
 void HtmlContext::fillTagVector(QString html)
 {
     QRegExp rx("<[^<]*>");
diff --git a/src/items/lrtextitemeditor.cpp b/src/items/lrtextitemeditor.cpp
index 527e66f..222d11a 100644
--- a/src/items/lrtextitemeditor.cpp
+++ b/src/items/lrtextitemeditor.cpp
@@ -38,6 +38,8 @@
 #include <QMenu>
 #include <QScrollBar>
 
+namespace LimeReport{
+
 TextItemEditor::TextItemEditor(LimeReport::TextItem *item, LimeReport::PageDesignIntf *page, QSettings* settings, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::TextItemEditor), m_textItem(item), m_page(page), m_settings(settings), m_ownedSettings(false), m_isReadingSetting(false)
@@ -376,3 +378,4 @@ void TextItemEditor::slotScriptItemsSelectionChanged(const QModelIndex &to, cons
     }
 }
 
+} // namespace LimeReport
diff --git a/src/items/lrtextitemeditor.h b/src/items/lrtextitemeditor.h
index 91b8fa1..e7b5ba4 100644
--- a/src/items/lrtextitemeditor.h
+++ b/src/items/lrtextitemeditor.h
@@ -37,6 +37,8 @@
 #include "lrtextitem.h"
 #include "lrpagedesignintf.h"
 
+namespace LimeReport{
+
 namespace Ui {
 class TextItemEditor;
 }
@@ -102,4 +104,6 @@ private:
     bool m_isReadingSetting;
 };
 
+} // namespace LimeReport
+
 #endif // LRTEXTITEMEDITOR_H
diff --git a/src/items/lrtextitemeditor.ui b/src/items/lrtextitemeditor.ui
index f6ca950..9030fdb 100644
--- a/src/items/lrtextitemeditor.ui
+++ b/src/items/lrtextitemeditor.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>TextItemEditor</class>
- <widget class="QWidget" name="TextItemEditor">
+ <class>LimeReport::TextItemEditor</class>
+ <widget class="QWidget" name="LimeReport::TextItemEditor">
   <property name="windowModality">
    <enum>Qt::ApplicationModal</enum>
   </property>
diff --git a/src/lraboutdialog.cpp b/src/lraboutdialog.cpp
index cd7fc6c..3228cfc 100644
--- a/src/lraboutdialog.cpp
+++ b/src/lraboutdialog.cpp
@@ -30,6 +30,8 @@
 #include "lraboutdialog.h"
 #include "ui_lraboutdialog.h"
 
+namespace LimeReport{
+
 AboutDialog::AboutDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::AboutDialog)
@@ -42,3 +44,5 @@ AboutDialog::~AboutDialog()
 {
     delete ui;
 }
+
+} //namespace LimeReport
diff --git a/src/lraboutdialog.h b/src/lraboutdialog.h
index f738719..62c2ff9 100644
--- a/src/lraboutdialog.h
+++ b/src/lraboutdialog.h
@@ -32,6 +32,8 @@
 
 #include <QDialog>
 
+namespace LimeReport{
+
 namespace Ui {
 class AboutDialog;
 }
@@ -48,4 +50,6 @@ private:
     Ui::AboutDialog *ui;
 };
 
+} //namespace LimeReport
+
 #endif // LRABOUTDIALOG_H
diff --git a/src/lraboutdialog.ui b/src/lraboutdialog.ui
index ad6e574..ad95565 100644
--- a/src/lraboutdialog.ui
+++ b/src/lraboutdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AboutDialog</class>
- <widget class="QDialog" name="AboutDialog">
+ <class>LimeReport::AboutDialog</class>
+ <widget class="QDialog" name="LimeReport::AboutDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -243,7 +243,7 @@ p, li { white-space: pre-wrap; }
   <connection>
    <sender>pushButton</sender>
    <signal>clicked()</signal>
-   <receiver>AboutDialog</receiver>
+   <receiver>LimeReport::AboutDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/lrbandsmanager.cpp b/src/lrbandsmanager.cpp
index 889e7b3..9e009de 100644
--- a/src/lrbandsmanager.cpp
+++ b/src/lrbandsmanager.cpp
@@ -39,6 +39,7 @@
 #include "lrgroupbands.h"
 
 namespace LimeReport{
+
 BandsManager::BandsManager(){}
 
 QStringList BandsManager::bandNames()
diff --git a/src/lrpagedesignintf.cpp b/src/lrpagedesignintf.cpp
index 103e68e..7242309 100644
--- a/src/lrpagedesignintf.cpp
+++ b/src/lrpagedesignintf.cpp
@@ -1993,9 +1993,8 @@ void CommandGroup::addCommand(CommandIf::Ptr command, bool execute)
     if (execute){
         if (command->doIt())
             m_commands.append(command);
-    }else{
+    } else
         m_commands.append(command);
-    }
 }
 
 PrintRange::PrintRange(QAbstractPrintDialog::PrintRange rangeType, int fromPage, int toPage)
diff --git a/src/lrpreviewreportwindow.h b/src/lrpreviewreportwindow.h
index 48f1742..38162c8 100644
--- a/src/lrpreviewreportwindow.h
+++ b/src/lrpreviewreportwindow.h
@@ -39,11 +39,12 @@
 #include "serializators/lrstorageintf.h"
 #include "serializators/lrxmlreader.h"
 
+namespace LimeReport {
+
 namespace Ui {
 class PreviewReportWindow;
 }
-//using namespace LimeReport;
-namespace LimeReport {
+
 class PreviewReportWindow : public QMainWindow
 {
     Q_OBJECT   
diff --git a/src/lrpreviewreportwindow.ui b/src/lrpreviewreportwindow.ui
index 19c51c6..632f7b0 100644
--- a/src/lrpreviewreportwindow.ui
+++ b/src/lrpreviewreportwindow.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>PreviewReportWindow</class>
- <widget class="QMainWindow" name="PreviewReportWindow">
+ <class>LimeReport::PreviewReportWindow</class>
+ <widget class="QMainWindow" name="LimeReport::PreviewReportWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -41,7 +41,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuView">
@@ -239,7 +239,7 @@
   <connection>
    <sender>actionPrint</sender>
    <signal>triggered()</signal>
-   <receiver>PreviewReportWindow</receiver>
+   <receiver>LimeReport::PreviewReportWindow</receiver>
    <slot>slotPrint()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -255,7 +255,7 @@
   <connection>
    <sender>actionPriorPage</sender>
    <signal>triggered()</signal>
-   <receiver>PreviewReportWindow</receiver>
+   <receiver>LimeReport::PreviewReportWindow</receiver>
    <slot>slotPriorPage()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -271,7 +271,7 @@
   <connection>
    <sender>actionNextPage</sender>
    <signal>triggered()</signal>
-   <receiver>PreviewReportWindow</receiver>
+   <receiver>LimeReport::PreviewReportWindow</receiver>
    <slot>slotNextPage()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -287,7 +287,7 @@
   <connection>
    <sender>actionZoomIn</sender>
    <signal>triggered()</signal>
-   <receiver>PreviewReportWindow</receiver>
+   <receiver>LimeReport::PreviewReportWindow</receiver>
    <slot>slotZoomIn()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -303,7 +303,7 @@
   <connection>
    <sender>actionZoomOut</sender>
    <signal>triggered()</signal>
-   <receiver>PreviewReportWindow</receiver>
+   <receiver>LimeReport::PreviewReportWindow</receiver>
    <slot>slotZoomOut()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -319,7 +319,7 @@
   <connection>
    <sender>actionClosePreview</sender>
    <signal>triggered()</signal>
-   <receiver>PreviewReportWindow</receiver>
+   <receiver>LimeReport::PreviewReportWindow</receiver>
    <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -335,7 +335,7 @@
   <connection>
    <sender>actionFirst_Page</sender>
    <signal>triggered()</signal>
-   <receiver>PreviewReportWindow</receiver>
+   <receiver>LimeReport::PreviewReportWindow</receiver>
    <slot>slotFirstPage()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -351,7 +351,7 @@
   <connection>
    <sender>actionLast_Page</sender>
    <signal>triggered()</signal>
-   <receiver>PreviewReportWindow</receiver>
+   <receiver>LimeReport::PreviewReportWindow</receiver>
    <slot>slotLastPage()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -367,7 +367,7 @@
   <connection>
    <sender>actionPrint_To_PDF</sender>
    <signal>triggered()</signal>
-   <receiver>PreviewReportWindow</receiver>
+   <receiver>LimeReport::PreviewReportWindow</receiver>
    <slot>slotPrintToPDF()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/lrreportrender.cpp b/src/lrreportrender.cpp
index 15850da..748e150 100644
--- a/src/lrreportrender.cpp
+++ b/src/lrreportrender.cpp
@@ -339,7 +339,6 @@ void ReportRender::renderBand(BandDesignIntf *patternBand, ReportRender::DataRen
                 }
             }
         } else {delete bandClone;}
-
         if (patternBand->isFooter())
             datasources()->clearGroupFunctionValues(patternBand->objectName());
     }
diff --git a/src/lrsettingdialog.h b/src/lrsettingdialog.h
index 4b82fbe..5a2cb48 100644
--- a/src/lrsettingdialog.h
+++ b/src/lrsettingdialog.h
@@ -3,11 +3,12 @@
 
 #include <QDialog>
 
+namespace LimeReport{
+
 namespace Ui {
 class SettingDialog;
 }
 
-namespace LimeReport{
 class SettingDialog : public QDialog
 {
     Q_OBJECT
diff --git a/src/lrsettingdialog.ui b/src/lrsettingdialog.ui
index f8c5120..6fd8520 100644
--- a/src/lrsettingdialog.ui
+++ b/src/lrsettingdialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>SettingDialog</class>
- <widget class="QDialog" name="SettingDialog">
+ <class>LimeReport::SettingDialog</class>
+ <widget class="QDialog" name="LimeReport::SettingDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>298</width>
-    <height>184</height>
+    <width>351</width>
+    <height>185</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -149,7 +149,7 @@
   <connection>
    <sender>bbOkCancel</sender>
    <signal>accepted()</signal>
-   <receiver>SettingDialog</receiver>
+   <receiver>LimeReport::SettingDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -165,7 +165,7 @@
   <connection>
    <sender>bbOkCancel</sender>
    <signal>rejected()</signal>
-   <receiver>SettingDialog</receiver>
+   <receiver>LimeReport::SettingDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/objectinspector/editors/lrbuttonlineeditor.cpp b/src/objectinspector/editors/lrbuttonlineeditor.cpp
index b49b14b..4f1bc64 100644
--- a/src/objectinspector/editors/lrbuttonlineeditor.cpp
+++ b/src/objectinspector/editors/lrbuttonlineeditor.cpp
@@ -37,6 +37,8 @@
 #include <QDesktopWidget>
 #include "lrtextitempropertyeditor.h"
 
+namespace LimeReport{
+
 ButtonLineEditor::ButtonLineEditor(const QString &propertyName, QWidget *parent) :
     QWidget(parent), m_overButton(false), m_propertyName(propertyName)
 {
@@ -130,3 +132,5 @@ void ButtonLineEditor::editingByEditorFinished()
     setText(qobject_cast<TextItemPropertyEditor*>(sender())->text());
     m_lineEdit->setFocus();
 }
+
+} //namespace LimeReport
diff --git a/src/objectinspector/editors/lrbuttonlineeditor.h b/src/objectinspector/editors/lrbuttonlineeditor.h
index f4205db..81d274e 100644
--- a/src/objectinspector/editors/lrbuttonlineeditor.h
+++ b/src/objectinspector/editors/lrbuttonlineeditor.h
@@ -38,6 +38,7 @@
 #include <QDebug>
 #include "lrtextitempropertyeditor.h"
 
+namespace LimeReport{
 
 class ButtonLineEditor : public QWidget
 {
@@ -64,4 +65,6 @@ private:
     //QHBoxLayout* m_layout;
 };
 
+} //namespace LimeReport
+
 #endif // LRBUTTONLINEEDIT_H
diff --git a/src/objectinspector/editors/lrcoloreditor.cpp b/src/objectinspector/editors/lrcoloreditor.cpp
index 25b0ec4..0d743e5 100644
--- a/src/objectinspector/editors/lrcoloreditor.cpp
+++ b/src/objectinspector/editors/lrcoloreditor.cpp
@@ -34,6 +34,8 @@
 #include <QPaintEvent>
 #include <QPainter>
 
+namespace LimeReport{
+
 ColorEditor::ColorEditor(QWidget *parent) :
     QWidget(parent), m_buttonPressed(false)
 {
@@ -126,3 +128,5 @@ QSize ColorIndicator::sizeHint() const
 {
     return QSize(20,20);
 }
+
+} // namespace LimeReport
diff --git a/src/objectinspector/editors/lrcoloreditor.h b/src/objectinspector/editors/lrcoloreditor.h
index 7971de7..f77fe81 100644
--- a/src/objectinspector/editors/lrcoloreditor.h
+++ b/src/objectinspector/editors/lrcoloreditor.h
@@ -34,6 +34,8 @@
 #include <QPushButton>
 #include <QToolButton>
 
+namespace LimeReport{
+
 class ColorIndicator : public QWidget{
     Q_OBJECT
 public:
@@ -69,4 +71,6 @@ private:
    bool m_buttonPressed;
 };
 
+} // namespace LimeReport
+
 #endif // LRCOLOREDITOR_H
diff --git a/src/objectinspector/editors/lrcomboboxeditor.cpp b/src/objectinspector/editors/lrcomboboxeditor.cpp
index c0b8464..3980444 100644
--- a/src/objectinspector/editors/lrcomboboxeditor.cpp
+++ b/src/objectinspector/editors/lrcomboboxeditor.cpp
@@ -37,6 +37,8 @@
 #include <QKeyEvent>
 #include "lrcomboboxeditor.h"
 
+namespace LimeReport{
+
 ComboBoxEditor::ComboBoxEditor(QWidget *parent, bool clearable) :
     QWidget(parent),
     m_comboBox(new InternalComboBox(this)),
@@ -138,3 +140,5 @@ void ComboBoxEditor::resizeEvent(QResizeEvent *e)
     if (m_buttonClear)
         m_buttonClear->setMinimumHeight(e->size().height()-4);
 }
+
+} // namespace LimeReport
diff --git a/src/objectinspector/editors/lrcomboboxeditor.h b/src/objectinspector/editors/lrcomboboxeditor.h
index d534fe8..b03d619 100644
--- a/src/objectinspector/editors/lrcomboboxeditor.h
+++ b/src/objectinspector/editors/lrcomboboxeditor.h
@@ -36,6 +36,8 @@
 
 class QToolButton;
 
+namespace LimeReport{
+
 class InternalComboBox :public QComboBox{
     Q_OBJECT
 public:
@@ -73,4 +75,6 @@ private:
     bool m_settingValues;
 };
 
+} // namespace LimeReport
+
 #endif // LRCOMBOBOXEDITOR_H
diff --git a/src/objectinspector/editors/lrfonteditor.cpp b/src/objectinspector/editors/lrfonteditor.cpp
index 421be77..1f3e97b 100644
--- a/src/objectinspector/editors/lrfonteditor.cpp
+++ b/src/objectinspector/editors/lrfonteditor.cpp
@@ -32,6 +32,8 @@
 #include <QFontDialog>
 #include <QDebug>
 
+namespace LimeReport{
+
 FontEditor::FontEditor(QWidget *parent) :
     QWidget(parent)
 {
@@ -79,3 +81,5 @@ QString FontEditor::toString(const QFont &value) const
     attribs+="]";
     return value.family()+" "+QString::number(value.pointSize())+" "+attribs;
 }
+
+} // namespace LimeReport
diff --git a/src/objectinspector/editors/lrfonteditor.h b/src/objectinspector/editors/lrfonteditor.h
index 703ed91..256ba2b 100644
--- a/src/objectinspector/editors/lrfonteditor.h
+++ b/src/objectinspector/editors/lrfonteditor.h
@@ -34,6 +34,8 @@
 #include <QPushButton>
 #include <QToolButton>
 
+namespace LimeReport{
+
 class FontEditor : public QWidget
 {
     Q_OBJECT
@@ -54,4 +56,6 @@ private:
     QFont m_font;
 };
 
+} // namespace LimeReport
+
 #endif // LRFONTEDITOR_H
diff --git a/src/objectinspector/editors/lrimageeditor.cpp b/src/objectinspector/editors/lrimageeditor.cpp
index 42bc2e1..c48d887 100644
--- a/src/objectinspector/editors/lrimageeditor.cpp
+++ b/src/objectinspector/editors/lrimageeditor.cpp
@@ -31,6 +31,8 @@
 #include <QFileDialog>
 #include "lrimageeditor.h"
 
+namespace LimeReport{
+
 ImageEditor::ImageEditor(QWidget* parent)
     :QWidget(parent)
 {
@@ -54,3 +56,5 @@ void ImageEditor::slotButtonClicked()
     m_image.load(QFileDialog::getOpenFileName(this));
     emit editingFinished();
 }
+
+} // namespace LimeReport
diff --git a/src/objectinspector/editors/lrimageeditor.h b/src/objectinspector/editors/lrimageeditor.h
index 0cd573e..ada3c87 100644
--- a/src/objectinspector/editors/lrimageeditor.h
+++ b/src/objectinspector/editors/lrimageeditor.h
@@ -32,6 +32,8 @@
 #include <QWidget>
 #include <QPushButton>
 
+namespace LimeReport{
+
 class ImageEditor : public QWidget
 {
     Q_OBJECT
@@ -49,4 +51,5 @@ private:
     QImage m_image;
 };
 
+} // namespace LimeReport
 #endif // LRIMAGEEDITOR_H
diff --git a/src/objectinspector/editors/lrtextitempropertyeditor.cpp b/src/objectinspector/editors/lrtextitempropertyeditor.cpp
index c27c7f4..84192fd 100644
--- a/src/objectinspector/editors/lrtextitempropertyeditor.cpp
+++ b/src/objectinspector/editors/lrtextitempropertyeditor.cpp
@@ -31,6 +31,8 @@
 #include "ui_ltextitempropertyeditor.h"
 #include <QCompleter>
 
+namespace LimeReport{
+
 TextItemPropertyEditor::TextItemPropertyEditor(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::TextItemPropertyEditor)
@@ -53,3 +55,5 @@ QString TextItemPropertyEditor::text()
 {
     return ui->textEdit->toPlainText();
 }
+
+} //namespace LimeReport
diff --git a/src/objectinspector/editors/lrtextitempropertyeditor.h b/src/objectinspector/editors/lrtextitempropertyeditor.h
index b50c536..fec9afc 100644
--- a/src/objectinspector/editors/lrtextitempropertyeditor.h
+++ b/src/objectinspector/editors/lrtextitempropertyeditor.h
@@ -33,6 +33,8 @@
 #include <QDialog>
 #include <QWidget>
 
+namespace LimeReport{
+
 namespace Ui {
     class TextItemPropertyEditor;
 }
@@ -53,4 +55,6 @@ private:
     Ui::TextItemPropertyEditor *ui;
 };
 
+} //namespace LimeReport
+
 #endif // ATEXTITEMPROPERTYEDITOR_H
diff --git a/src/objectinspector/editors/ltextitempropertyeditor.ui b/src/objectinspector/editors/ltextitempropertyeditor.ui
index e31e8be..0233118 100644
--- a/src/objectinspector/editors/ltextitempropertyeditor.ui
+++ b/src/objectinspector/editors/ltextitempropertyeditor.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>TextItemPropertyEditor</class>
- <widget class="QDialog" name="TextItemPropertyEditor">
+ <class>LimeReport::TextItemPropertyEditor</class>
+ <widget class="QDialog" name="LimeReport::TextItemPropertyEditor">
   <property name="windowModality">
    <enum>Qt::WindowModal</enum>
   </property>
@@ -43,7 +43,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>TextItemPropertyEditor</receiver>
+   <receiver>LimeReport::TextItemPropertyEditor</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -59,7 +59,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>TextItemPropertyEditor</receiver>
+   <receiver>LimeReport::TextItemPropertyEditor</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/objectsbrowser/lrobjectbrowser.cpp b/src/objectsbrowser/lrobjectbrowser.cpp
index 4ae7d2e..57df82f 100644
--- a/src/objectsbrowser/lrobjectbrowser.cpp
+++ b/src/objectsbrowser/lrobjectbrowser.cpp
@@ -34,7 +34,6 @@
 
 namespace LimeReport{
 
-
 ObjectBrowser::ObjectBrowser(QWidget *parent)
     :QWidget(parent), m_changingItemSelection(false)
 {