Merge pull request #2904 from ivaradi/ui-namespace

Move FolderCreationDialog into the OCC namespace
This commit is contained in:
allexzander 2021-02-05 19:19:56 +02:00 committed by GitHub
commit 496f174232
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions

View file

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

View file

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

View file

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