Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Moved Merge subsystem into merge namespace.

Browse Source
This commit is contained in:
Jim Evins
2016-05-22 14:38:59 -04:00
parent b1e7a6507c
commit c7f02f027a
34 changed files with 1434 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/MergeView.h
+4 -4
View File
@@ -22,16 +22,16 @@
#define MergeView_h
#include "ui_MergeView.h"
#include "Merge/Merge.h"
// Forward references
class LabelModel;
class UndoRedoModel;
class Merge;
///
/// Merge Property Editor Widget
/// merge::Merge Property Editor Widget
///
class MergeView : public QWidget, public Ui_MergeView
{
@@ -71,8 +71,8 @@ private slots:
// Private methods
/////////////////////////////////
private:
void loadHeaders( Merge* merge );
void loadTable( Merge* merge );
void loadHeaders( merge::Merge* merge );
void loadTable( merge::Merge* merge );
/////////////////////////////////