From: Rafał Długołęcki <rafal@dlugolecki.net.pl>
Date: Thu, 28 Jan 2016 21:08:14 +0000 (+0100)
Subject: Move editor dialogs to separate namespace
X-Git-Tag: 3.4-b1~27
X-Git-Url: https://git.dlugolecki.net.pl/?a=commitdiff_plain;h=a59934763b8954a15d00efa78fb371330e8c71ce;p=vlp.git

Move editor dialogs to separate namespace
---

diff --git a/src/edit/PreferencesDialog.cpp b/src/edit/PreferencesDialog.cpp
index ff355ce..9d56c94 100644
--- a/src/edit/PreferencesDialog.cpp
+++ b/src/edit/PreferencesDialog.cpp
@@ -2,6 +2,7 @@
 
 namespace loglan {
 namespace vlp {
+namespace dialog {
 
 PreferencesDialog::PreferencesDialog(QWidget * parent)
 	: QDialog(parent)
@@ -48,3 +49,4 @@ void PreferencesDialog::setGenPath(QString path)
 
 }
 }
+}
diff --git a/src/edit/PreferencesDialog.h b/src/edit/PreferencesDialog.h
index 7311c65..076681c 100644
--- a/src/edit/PreferencesDialog.h
+++ b/src/edit/PreferencesDialog.h
@@ -8,6 +8,7 @@
 
 namespace loglan {
 namespace vlp {
+namespace dialog {
 
 /**
  * Program Unit Dialog class
@@ -68,6 +69,7 @@ public:
 	void setGenPath(QString path);
 };
 
+}
 }
 }
 
diff --git a/src/edit/ProgramStructureDialog.cpp b/src/edit/ProgramStructureDialog.cpp
index 623c6ae..79a34ad 100644
--- a/src/edit/ProgramStructureDialog.cpp
+++ b/src/edit/ProgramStructureDialog.cpp
@@ -2,6 +2,7 @@
 
 namespace loglan {
 namespace vlp {
+namespace dialog {
 
 
 ProgramStructureDialog::ProgramStructureDialog(QWidget * parent)
@@ -31,3 +32,4 @@ QString ProgramStructureDialog::getCode()
 
 }
 }
+}
diff --git a/src/edit/ProgramStructureDialog.h b/src/edit/ProgramStructureDialog.h
index 854e3d9..578a08e 100644
--- a/src/edit/ProgramStructureDialog.h
+++ b/src/edit/ProgramStructureDialog.h
@@ -9,6 +9,7 @@
 
 namespace loglan {
 namespace vlp {
+namespace dialog {
 
 /**
  * Program Structure Dialog class
@@ -41,6 +42,7 @@ public:
 	QString getCode();
 };
 
+}
 }
 }
 
diff --git a/src/edit/UnitStructureDialog.cpp b/src/edit/UnitStructureDialog.cpp
index 01db86b..2465549 100644
--- a/src/edit/UnitStructureDialog.cpp
+++ b/src/edit/UnitStructureDialog.cpp
@@ -2,6 +2,7 @@
 
 namespace loglan {
 namespace vlp {
+namespace dialog {
 
 #define TYPENUM	5
 
@@ -51,3 +52,4 @@ QString UnitStructureDialog::getCode()
 
 }
 }
+}
diff --git a/src/edit/UnitStructureDialog.h b/src/edit/UnitStructureDialog.h
index 6dc5aac..a31a147 100644
--- a/src/edit/UnitStructureDialog.h
+++ b/src/edit/UnitStructureDialog.h
@@ -8,6 +8,7 @@
 
 namespace loglan {
 namespace vlp {
+namespace dialog {
 
 /**
  * Program Unit Dialog class
@@ -40,6 +41,7 @@ public:
 	QString getCode();
 };
 
+}
 }
 }
 
diff --git a/src/edit/editor.cpp b/src/edit/editor.cpp
index 563a3e6..a64d42d 100644
--- a/src/edit/editor.cpp
+++ b/src/edit/editor.cpp
@@ -312,7 +312,7 @@ void Editor::on_actionFind_Next_triggered()
  */
 void Editor::on_actionPreferences_triggered()
 {
-	PreferencesDialog dialog(this);
+	dialog::PreferencesDialog dialog(this);
 
 	dialog.setCompilerPath(compiler_path);
 	dialog.setFilesPath(file_path);
@@ -353,7 +353,7 @@ void Editor::on_actionCompile_Gen_triggered()
 
 void Editor::on_actionProgram_structure_triggered()
 {
-	ProgramStructureDialog dialog(this);
+	dialog::ProgramStructureDialog dialog(this);
 
 	if (dialog.exec()) {
 		editor->textCursor().insertText(dialog.getCode());
@@ -362,7 +362,7 @@ void Editor::on_actionProgram_structure_triggered()
 
 void Editor::on_actionUnit_structure_triggered()
 {
-	UnitStructureDialog dialog(this);
+	dialog::UnitStructureDialog dialog(this);
 
 	if (dialog.exec()) {
 		editor->textCursor().insertText(dialog.getCode());