dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
vlp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a3287b
)
Move editor dialogs to separate namespace
author
Rafał Długołęcki
<rafal@dlugolecki.net.pl>
Thu, 28 Jan 2016 21:08:14 +0000
(22:08 +0100)
committer
Rafał Długołęcki
<rafal@dlugolecki.net.pl>
Thu, 28 Jan 2016 21:08:14 +0000
(22:08 +0100)
src/edit/PreferencesDialog.cpp
patch
|
blob
|
history
src/edit/PreferencesDialog.h
patch
|
blob
|
history
src/edit/ProgramStructureDialog.cpp
patch
|
blob
|
history
src/edit/ProgramStructureDialog.h
patch
|
blob
|
history
src/edit/UnitStructureDialog.cpp
patch
|
blob
|
history
src/edit/UnitStructureDialog.h
patch
|
blob
|
history
src/edit/editor.cpp
patch
|
blob
|
history
diff --git
a/src/edit/PreferencesDialog.cpp
b/src/edit/PreferencesDialog.cpp
index ff355ce9f9efc65d92aac1cb7e34d14fb47c4862..9d56c94f2358ee1836cf1be1a57093a2973a2a3b 100644
(file)
--- a/
src/edit/PreferencesDialog.cpp
+++ b/
src/edit/PreferencesDialog.cpp
@@
-2,6
+2,7
@@
namespace loglan {
namespace vlp {
namespace loglan {
namespace vlp {
+namespace dialog {
PreferencesDialog::PreferencesDialog(QWidget * parent)
: QDialog(parent)
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 7311c659a8271eba95333d3ac01dfe895a03e8ff..076681c471d44f1556a3d8a1721cb7715113a848 100644
(file)
--- a/
src/edit/PreferencesDialog.h
+++ b/
src/edit/PreferencesDialog.h
@@
-8,6
+8,7
@@
namespace loglan {
namespace vlp {
namespace loglan {
namespace vlp {
+namespace dialog {
/**
* Program Unit Dialog class
/**
* Program Unit Dialog class
@@
-68,6
+69,7
@@
public:
void setGenPath(QString path);
};
void setGenPath(QString path);
};
+}
}
}
}
}
diff --git
a/src/edit/ProgramStructureDialog.cpp
b/src/edit/ProgramStructureDialog.cpp
index 623c6aef643d51b2d7096edf63433c5e188e90f3..79a34addb9e5aa4af282f0b03cd7e6c03e7628a4 100644
(file)
--- a/
src/edit/ProgramStructureDialog.cpp
+++ b/
src/edit/ProgramStructureDialog.cpp
@@
-2,6
+2,7
@@
namespace loglan {
namespace vlp {
namespace loglan {
namespace vlp {
+namespace dialog {
ProgramStructureDialog::ProgramStructureDialog(QWidget * parent)
ProgramStructureDialog::ProgramStructureDialog(QWidget * parent)
@@
-31,3
+32,4
@@
QString ProgramStructureDialog::getCode()
}
}
}
}
+}
diff --git
a/src/edit/ProgramStructureDialog.h
b/src/edit/ProgramStructureDialog.h
index 854e3d9c9c8690cfa790f10a111079c2908a2440..578a08e261eb2071e1d01caab6cff85e1d193fef 100644
(file)
--- a/
src/edit/ProgramStructureDialog.h
+++ b/
src/edit/ProgramStructureDialog.h
@@
-9,6
+9,7
@@
namespace loglan {
namespace vlp {
namespace loglan {
namespace vlp {
+namespace dialog {
/**
* Program Structure Dialog class
/**
* Program Structure Dialog class
@@
-41,6
+42,7
@@
public:
QString getCode();
};
QString getCode();
};
+}
}
}
}
}
diff --git
a/src/edit/UnitStructureDialog.cpp
b/src/edit/UnitStructureDialog.cpp
index 01db86b569e31cf14fae18e0ce88a5877439a990..246554903b5eb93599685abef510f387bc2cb3a6 100644
(file)
--- a/
src/edit/UnitStructureDialog.cpp
+++ b/
src/edit/UnitStructureDialog.cpp
@@
-2,6
+2,7
@@
namespace loglan {
namespace vlp {
namespace loglan {
namespace vlp {
+namespace dialog {
#define TYPENUM 5
#define TYPENUM 5
@@
-51,3
+52,4
@@
QString UnitStructureDialog::getCode()
}
}
}
}
+}
diff --git
a/src/edit/UnitStructureDialog.h
b/src/edit/UnitStructureDialog.h
index 6dc5aac2d6e926ab7e60d53ceb55ad3783c29680..a31a147ccaa3be7f945603a986299823b6ffbfb4 100644
(file)
--- a/
src/edit/UnitStructureDialog.h
+++ b/
src/edit/UnitStructureDialog.h
@@
-8,6
+8,7
@@
namespace loglan {
namespace vlp {
namespace loglan {
namespace vlp {
+namespace dialog {
/**
* Program Unit Dialog class
/**
* Program Unit Dialog class
@@
-40,6
+41,7
@@
public:
QString getCode();
};
QString getCode();
};
+}
}
}
}
}
diff --git
a/src/edit/editor.cpp
b/src/edit/editor.cpp
index 563a3e60cd18853ca6dfc0dc3e1e84bb394e6fd8..a64d42d58bebb304ab6e964ca6f2fdeb52328c70 100644
(file)
--- 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()
{
*/
void Editor::on_actionPreferences_triggered()
{
- PreferencesDialog dialog(this);
+
dialog::
PreferencesDialog dialog(this);
dialog.setCompilerPath(compiler_path);
dialog.setFilesPath(file_path);
dialog.setCompilerPath(compiler_path);
dialog.setFilesPath(file_path);
@@
-353,7
+353,7
@@
void Editor::on_actionCompile_Gen_triggered()
void Editor::on_actionProgram_structure_triggered()
{
void Editor::on_actionProgram_structure_triggered()
{
- ProgramStructureDialog dialog(this);
+
dialog::
ProgramStructureDialog dialog(this);
if (dialog.exec()) {
editor->textCursor().insertText(dialog.getCode());
if (dialog.exec()) {
editor->textCursor().insertText(dialog.getCode());
@@
-362,7
+362,7
@@
void Editor::on_actionProgram_structure_triggered()
void Editor::on_actionUnit_structure_triggered()
{
void Editor::on_actionUnit_structure_triggered()
{
- UnitStructureDialog dialog(this);
+
dialog::
UnitStructureDialog dialog(this);
if (dialog.exec()) {
editor->textCursor().insertText(dialog.getCode());
if (dialog.exec()) {
editor->textCursor().insertText(dialog.getCode());