social -> gnunet/social

25 files changed, 28 insertions, 28 deletions

diff --git a/secushare.pro b/secushare.pro
index 05da98d..32d28d0 100644
--- a/secushare.pro
+++ b/secushare.pro
@@ -28,14 +28,14 @@ SOURCES += src/main.cpp \
     src/model/ThreadListModel.cpp \
     src/model/ThreadModel.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 \
-    src/social/host.cpp \
-    src/social/guest.cpp \
+    src/gnunet/social/socialapp.cpp \
+    src/gnunet/social/nym.cpp \
+    src/gnunet/social/ego.cpp \
+    src/gnunet/social/modifier.cpp \
+    src/gnunet/social/message.cpp \
+    src/gnunet/social/place.cpp \
+    src/gnunet/social/host.cpp \
+    src/gnunet/social/guest.cpp \
     src/settings/settings.cpp \
     src/util/helpers.cpp \
     src/util/qrimageprovider.cpp
@@ -58,14 +58,14 @@ HEADERS += \
     src/model/PlaceListModel.h \
     src/model/ThreadListModel.h \
     src/model/ThreadModel.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 \
-    src/social/host.h \
-    src/social/guest.h \
+    src/gnunet/social/socialapp.h \
+    src/gnunet/social/nym.h \
+    src/gnunet/social/ego.h \
+    src/gnunet/social/modifier.h \
+    src/gnunet/social/message.h \
+    src/gnunet/social/place.h \
+    src/gnunet/social/host.h \
+    src/gnunet/social/guest.h \
     src/settings/settings.h \
     src/util/helpers.h \
     src/util/qrimageprovider.h
diff --git a/src/app.cpp b/src/app.cpp
index c59856b..c249ab5 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -1,9 +1,9 @@
 #include "app.h"
 
-#include "social/socialapp.h"
-#include "social/place.h"
-#include "social/host.h"
-#include "social/guest.h"
+#include "gnunet/social/socialapp.h"
+#include "gnunet/social/place.h"
+#include "gnunet/social/host.h"
+#include "gnunet/social/guest.h"
 
 #include <QApplication>
 #include <QMenu>
diff --git a/src/app.h b/src/app.h
index eca9460..6b95df3 100644
--- a/src/app.h
+++ b/src/app.h
@@ -8,8 +8,8 @@
 #include <QQuickWindow>
 
 #include "gnunet/gnunet.h"
+#include "gnunet/social/socialapp.h"
 #include "model/models.h"
-#include "social/socialapp.h"
 #include "settings/settings.h"
 #include "util/helpers.h"
 #include "util/qrimageprovider.h"
diff --git a/src/social/ego.cpp b/src/gnunet/social/ego.cpp
index 410bab8..410bab8 100644
--- a/src/social/ego.cpp
+++ b/src/gnunet/social/ego.cpp
diff --git a/src/social/ego.h b/src/gnunet/social/ego.h
index fbf6370..fbf6370 100644
--- a/src/social/ego.h
+++ b/src/gnunet/social/ego.h
diff --git a/src/social/guest.cpp b/src/gnunet/social/guest.cpp
index 0108598..0108598 100644
--- a/src/social/guest.cpp
+++ b/src/gnunet/social/guest.cpp
diff --git a/src/social/guest.h b/src/gnunet/social/guest.h
index 6d26864..6d26864 100644
--- a/src/social/guest.h
+++ b/src/gnunet/social/guest.h
diff --git a/src/social/host.cpp b/src/gnunet/social/host.cpp
index 94a8dee..94a8dee 100644
--- a/src/social/host.cpp
+++ b/src/gnunet/social/host.cpp
diff --git a/src/social/host.h b/src/gnunet/social/host.h
index ced0000..ced0000 100644
--- a/src/social/host.h
+++ b/src/gnunet/social/host.h
diff --git a/src/social/message.cpp b/src/gnunet/social/message.cpp
index abc3f9c..abc3f9c 100644
--- a/src/social/message.cpp
+++ b/src/gnunet/social/message.cpp
diff --git a/src/social/message.h b/src/gnunet/social/message.h
index b3735ef..b3735ef 100644
--- a/src/social/message.h
+++ b/src/gnunet/social/message.h
diff --git a/src/social/modifier.cpp b/src/gnunet/social/modifier.cpp
index a784db2..a784db2 100644
--- a/src/social/modifier.cpp
+++ b/src/gnunet/social/modifier.cpp
diff --git a/src/social/modifier.h b/src/gnunet/social/modifier.h
index bfcb51c..bfcb51c 100644
--- a/src/social/modifier.h
+++ b/src/gnunet/social/modifier.h
diff --git a/src/social/nym.cpp b/src/gnunet/social/nym.cpp
index 007b26c..007b26c 100644
--- a/src/social/nym.cpp
+++ b/src/gnunet/social/nym.cpp
diff --git a/src/social/nym.h b/src/gnunet/social/nym.h
index 9c7b88b..9c7b88b 100644
--- a/src/social/nym.h
+++ b/src/gnunet/social/nym.h
diff --git a/src/social/place.cpp b/src/gnunet/social/place.cpp
index 8b1f4f3..8b1f4f3 100644
--- a/src/social/place.cpp
+++ b/src/gnunet/social/place.cpp
diff --git a/src/social/place.h b/src/gnunet/social/place.h
index c5445be..c5445be 100644
--- a/src/social/place.h
+++ b/src/gnunet/social/place.h
diff --git a/src/social/socialapp.cpp b/src/gnunet/social/socialapp.cpp
index e739574..e739574 100644
--- a/src/social/socialapp.cpp
+++ b/src/gnunet/social/socialapp.cpp
diff --git a/src/social/socialapp.h b/src/gnunet/social/socialapp.h
index 36b4ee4..36b4ee4 100644
--- a/src/social/socialapp.h
+++ b/src/gnunet/social/socialapp.h
diff --git a/src/model/EgoListModel.h b/src/model/EgoListModel.h
index 3347ab7..48b1e6a 100644
--- a/src/model/EgoListModel.h
+++ b/src/model/EgoListModel.h
@@ -24,7 +24,7 @@
 #include <QAbstractTableModel>
 #include <QTimer>
 
-#include "social/ego.h"
+#include "gnunet/social/ego.h"
 #include "gnunet.h"
 
 
diff --git a/src/model/NymListModel.h b/src/model/NymListModel.h
index 1546c26..db95b39 100644
--- a/src/model/NymListModel.h
+++ b/src/model/NymListModel.h
@@ -24,7 +24,7 @@
 #include <QAbstractTableModel>
 #include <QTimer>
 
-#include "social/ego.h"
+#include "gnunet/social/nym.h"
 #include "gnunet.h"
 
 
@@ -64,7 +64,7 @@ public:
 public slots:
 
   void
-    rowAdded (Nym *ego);
+    rowAdded (Nym *nym);
 
   void
     rowModified (int index);
diff --git a/src/model/PlaceListModel.h b/src/model/PlaceListModel.h
index 452162a..ac755e0 100644
--- a/src/model/PlaceListModel.h
+++ b/src/model/PlaceListModel.h
@@ -24,7 +24,7 @@
 #include <QAbstractListModel>
 
 #include "ThreadListModel.h"
-#include "social/place.h"
+#include "gnunet/social/place.h"
 
 
 class PlaceListModel : public QAbstractListModel
diff --git a/src/model/ThreadListModel.h b/src/model/ThreadListModel.h
index 0d67b88..5c6d94c 100644
--- a/src/model/ThreadListModel.h
+++ b/src/model/ThreadListModel.h
@@ -4,7 +4,7 @@
 #include <QAbstractListModel>
 
 #include "ThreadModel.h"
-#include "social/place.h"
+#include "gnunet/social/place.h"
 
 
 class ThreadListModel : public QAbstractListModel
diff --git a/src/model/ThreadModel.h b/src/model/ThreadModel.h
index ff1111f..f28eab7 100644
--- a/src/model/ThreadModel.h
+++ b/src/model/ThreadModel.h
@@ -1,7 +1,7 @@
 #ifndef THREADMODEL_H
 #define THREADMODEL_H
 
-#include "social/message.h"
+#include "gnunet/social/message.h"
 #include <QAbstractItemModel>
 
 class ThreadModel : public QAbstractItemModel
diff --git a/src/util/qrimageprovider.h b/src/util/qrimageprovider.h
index 10ffdc4..531a465 100644
--- a/src/util/qrimageprovider.h
+++ b/src/util/qrimageprovider.h
@@ -2,7 +2,7 @@
 #define QRIMAGEPROVIDER_H
 
 #include <QQuickImageProvider>
-#include "social/nym.h"
+#include "gnunet/social/nym.h"
 
 
 class QrImageProvider : public QQuickImageProvider