mv nym

9 files changed, 7 insertions, 10 deletions

diff --git a/secushare.pro b/secushare.pro
index 3dbcb40..de1d872 100644
--- a/secushare.pro
+++ b/secushare.pro
@@ -25,10 +25,10 @@ SOURCES += src/main.cpp \
     src/model/EgoListModel.cpp \
     src/model/PlaceListModel.cpp \
     src/model/ThreadModel.cpp \
-    src/nym/nym.cpp \
-    src/nym/ego.cpp \
     src/gnunet/gnunet.cpp \
     src/social/socialapp.cpp \
+    src/social/nym.cpp \
+    src/social/ego.cpp \
     src/social/modifier.cpp \
     src/social/message.cpp \
     src/social/place.cpp \
@@ -54,9 +54,9 @@ HEADERS += \
     src/model/EgoListModel.h \
     src/model/PlaceListModel.h \
     src/model/ThreadModel.h \
-    src/nym/nym.h \
-    src/nym/ego.h \
     src/social/socialapp.h \
+    src/social/nym.h \
+    src/social/ego.h \
     src/social/modifier.h \
     src/social/message.h \
     src/social/place.h \
diff --git a/src/model/EgoListModel.h b/src/model/EgoListModel.h
index dbc4147..c75aa07 100644
--- a/src/model/EgoListModel.h
+++ b/src/model/EgoListModel.h
@@ -24,7 +24,7 @@
 #include <QAbstractTableModel>
 #include <QTimer>
 
-#include "nym/ego.h"
+#include "social/ego.h"
 #include "gnunet.h"
 
 
diff --git a/src/nym/ego.cpp b/src/social/ego.cpp
index 410bab8..410bab8 100644
--- a/src/nym/ego.cpp
+++ b/src/social/ego.cpp
diff --git a/src/nym/ego.h b/src/social/ego.h
index fbf6370..fbf6370 100644
--- a/src/nym/ego.h
+++ b/src/social/ego.h
diff --git a/src/nym/nym.cpp b/src/social/nym.cpp
index 007b26c..007b26c 100644
--- a/src/nym/nym.cpp
+++ b/src/social/nym.cpp
diff --git a/src/nym/nym.h b/src/social/nym.h
index d961c69..d961c69 100644
--- a/src/nym/nym.h
+++ b/src/social/nym.h
diff --git a/src/social/socialapp.cpp b/src/social/socialapp.cpp
index b6f5d7c..027f650 100644
--- a/src/social/socialapp.cpp
+++ b/src/social/socialapp.cpp
@@ -1,9 +1,6 @@
 #include "social/socialapp.h"
 #include "app.h"
 
-#include "nym/ego.h"
-#include "model/models.h"
-
 #include "social/host.h"
 #include "social/guest.h"
 
diff --git a/src/social/socialapp.h b/src/social/socialapp.h
index 4aaa2c3..0800b14 100644
--- a/src/social/socialapp.h
+++ b/src/social/socialapp.h
@@ -4,7 +4,7 @@
 #include <QObject>
 #include <QDebug>
 
-#include "nym/ego.h"
+#include "social/ego.h"
 #include "social/place.h"
 #include "gnunet.h"
 
diff --git a/src/util/qrimageprovider.h b/src/util/qrimageprovider.h
index 163de31..10ffdc4 100644
--- a/src/util/qrimageprovider.h
+++ b/src/util/qrimageprovider.h
@@ -2,7 +2,7 @@
 #define QRIMAGEPROVIDER_H
 
 #include <QQuickImageProvider>
-#include "nym/nym.h"
+#include "social/nym.h"
 
 
 class QrImageProvider : public QQuickImageProvider