Merge pull request #2904 from ivaradi/ui-namespace

Move FolderCreationDialog into the OCC namespace

src/gui/foldercreationdialog.cpp

@@ -20,6 +20,8 @@
 #include <QDir>
 #include <QMessageBox>
 
+namespace OCC {
+
 FolderCreationDialog::FolderCreationDialog(const QString &destination, QWidget *parent)
     : QDialog(parent)
     , ui(new Ui::FolderCreationDialog)
@@ -82,3 +84,5 @@ void FolderCreationDialog::slotNewFolderNameEditTextEdited()
         ui->labelErrorMessage->setVisible(false);
     }
 }
+
+}

src/gui/foldercreationdialog.h

@@ -17,6 +17,8 @@
 
 #include <QDialog>
 
+namespace OCC {
+
 namespace Ui {
 class FolderCreationDialog;
 }
@@ -40,4 +42,6 @@ private:
     QString _destination;
 };
 
+}
+
 #endif // FOLDERCREATIONDIALOG_H

src/gui/foldercreationdialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>FolderCreationDialog</class>
+ <class>OCC::FolderCreationDialog</class>
- <widget class="QDialog" name="FolderCreationDialog">
+ <widget class="QDialog" name="OCC::FolderCreationDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -67,7 +67,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>FolderCreationDialog</receiver>
+   <receiver>OCC::FolderCreationDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -83,7 +83,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>FolderCreationDialog</receiver>
+   <receiver>OCC::FolderCreationDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">