diff --git a/qtox.pro b/qtox.pro
index d6f0e1969..e85d7e6ce 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -26,10 +26,10 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = qtox
TEMPLATE = app
FORMS += \
- mainwindow.ui \
- widget/form/settings/generalsettings.ui \
- widget/form/settings/avsettings.ui \
- widget/form/settings/identitysettings.ui
+ src/mainwindow.ui \
+ src/widget/form/settings/generalsettings.ui \
+ src/widget/form/settings/avsettings.ui \
+ src/widget/form/settings/identitysettings.ui
CONFIG += c++11
TRANSLATIONS = translations/de.ts \
@@ -88,97 +88,97 @@ win32 {
# -pthread -lrt -lGL -lpthread -Wl,-Bdynamic -ldl -lc
#QMAKE_CXXFLAGS += -Os -flto -static-libstdc++ -static-libgcc
-HEADERS += widget/form/addfriendform.h \
- widget/form/chatform.h \
- widget/form/groupchatform.h \
- widget/form/settingswidget.h \
- widget/form/settings/genericsettings.h \
- widget/form/settings/generalform.h \
- widget/form/settings/identityform.h \
- widget/form/settings/privacyform.h \
- widget/form/settings/avform.h \
- widget/form/filesform.h \
- widget/tool/chattextedit.h \
- widget/tool/friendrequestdialog.h \
- widget/friendwidget.h \
- widget/groupwidget.h \
- widget/widget.h \
- friend.h \
- group.h \
- grouplist.h \
- misc/settings.h \
- core.h \
- friendlist.h \
- misc/cdata.h \
- misc/cstring.h \
- widget/camera.h \
- widget/netcamview.h \
- misc/smileypack.h \
- widget/emoticonswidget.h \
- misc/style.h \
- widget/adjustingscrollarea.h \
- widget/croppinglabel.h \
- widget/friendlistwidget.h \
- widget/genericchatroomwidget.h \
- widget/form/genericchatform.h \
- widget/tool/chatactions/chataction.h \
- widget/chatareawidget.h \
- filetransferinstance.h \
- corestructs.h \
- coredefines.h \
- coreav.h \
- widget/tool/chatactions/messageaction.h \
- widget/tool/chatactions/filetransferaction.h \
- widget/tool/chatactions/systemmessageaction.h \
- widget/tool/chatactions/actionaction.h \
- widget/maskablepixmapwidget.h \
- videosource.h \
- cameraworker.h \
- widget/videosurface.h
+HEADERS += src/widget/form/addfriendform.h \
+ src/widget/form/chatform.h \
+ src/widget/form/groupchatform.h \
+ src/widget/form/settingswidget.h \
+ src/widget/form/settings/genericsettings.h \
+ src/widget/form/settings/generalform.h \
+ src/widget/form/settings/identityform.h \
+ src/widget/form/settings/privacyform.h \
+ src/widget/form/settings/avform.h \
+ src/widget/form/filesform.h \
+ src/widget/tool/chattextedit.h \
+ src/widget/tool/friendrequestdialog.h \
+ src/widget/friendwidget.h \
+ src/widget/groupwidget.h \
+ src/widget/widget.h \
+ src/friend.h \
+ src/group.h \
+ src/grouplist.h \
+ src/misc/settings.h \
+ src/core.h \
+ src/friendlist.h \
+ src/misc/cdata.h \
+ src/misc/cstring.h \
+ src/widget/camera.h \
+ src/widget/netcamview.h \
+ src/misc/smileypack.h \
+ src/widget/emoticonswidget.h \
+ src/misc/style.h \
+ src/widget/adjustingscrollarea.h \
+ src/widget/croppinglabel.h \
+ src/widget/friendlistwidget.h \
+ src/widget/genericchatroomwidget.h \
+ src/widget/form/genericchatform.h \
+ src/widget/tool/chatactions/chataction.h \
+ src/widget/chatareawidget.h \
+ src/filetransferinstance.h \
+ src/corestructs.h \
+ src/coredefines.h \
+ src/coreav.h \
+ src/widget/tool/chatactions/messageaction.h \
+ src/widget/tool/chatactions/filetransferaction.h \
+ src/widget/tool/chatactions/systemmessageaction.h \
+ src/widget/tool/chatactions/actionaction.h \
+ src/widget/maskablepixmapwidget.h \
+ src/videosource.h \
+ src/cameraworker.h \
+ src/widget/videosurface.h
SOURCES += \
- widget/form/addfriendform.cpp \
- widget/form/chatform.cpp \
- widget/form/groupchatform.cpp \
- widget/form/settingswidget.cpp \
- widget/form/settings/generalform.cpp \
- widget/form/settings/identityform.cpp \
- widget/form/settings/privacyform.cpp \
- widget/form/settings/avform.cpp \
- widget/form/filesform.cpp \
- widget/tool/chattextedit.cpp \
- widget/tool/friendrequestdialog.cpp \
- widget/friendwidget.cpp \
- widget/groupwidget.cpp \
- widget/widget.cpp \
- core.cpp \
- friend.cpp \
- friendlist.cpp \
- group.cpp \
- grouplist.cpp \
- main.cpp \
- misc/settings.cpp \
- misc/cdata.cpp \
- misc/cstring.cpp \
- widget/camera.cpp \
- widget/netcamview.cpp \
- misc/smileypack.cpp \
- widget/emoticonswidget.cpp \
- misc/style.cpp \
- widget/adjustingscrollarea.cpp \
- widget/croppinglabel.cpp \
- widget/friendlistwidget.cpp \
- coreav.cpp \
- widget/genericchatroomwidget.cpp \
- widget/form/genericchatform.cpp \
- widget/tool/chatactions/chataction.cpp \
- widget/chatareawidget.cpp \
- filetransferinstance.cpp \
- corestructs.cpp \
- widget/tool/chatactions/messageaction.cpp \
- widget/tool/chatactions/filetransferaction.cpp \
- widget/tool/chatactions/systemmessageaction.cpp \
- widget/tool/chatactions/actionaction.cpp \
- widget/maskablepixmapwidget.cpp \
- cameraworker.cpp \
- widget/videosurface.cpp
+ src/widget/form/addfriendform.cpp \
+ src/widget/form/chatform.cpp \
+ src/widget/form/groupchatform.cpp \
+ src/widget/form/settingswidget.cpp \
+ src/widget/form/settings/generalform.cpp \
+ src/widget/form/settings/identityform.cpp \
+ src/widget/form/settings/privacyform.cpp \
+ src/widget/form/settings/avform.cpp \
+ src/widget/form/filesform.cpp \
+ src/widget/tool/chattextedit.cpp \
+ src/widget/tool/friendrequestdialog.cpp \
+ src/widget/friendwidget.cpp \
+ src/widget/groupwidget.cpp \
+ src/widget/widget.cpp \
+ src/core.cpp \
+ src/friend.cpp \
+ src/friendlist.cpp \
+ src/group.cpp \
+ src/grouplist.cpp \
+ src/main.cpp \
+ src/misc/settings.cpp \
+ src/misc/cdata.cpp \
+ src/misc/cstring.cpp \
+ src/widget/camera.cpp \
+ src/widget/netcamview.cpp \
+ src/misc/smileypack.cpp \
+ src/widget/emoticonswidget.cpp \
+ src/misc/style.cpp \
+ src/widget/adjustingscrollarea.cpp \
+ src/widget/croppinglabel.cpp \
+ src/widget/friendlistwidget.cpp \
+ src/coreav.cpp \
+ src/widget/genericchatroomwidget.cpp \
+ src/widget/form/genericchatform.cpp \
+ src/widget/tool/chatactions/chataction.cpp \
+ src/widget/chatareawidget.cpp \
+ src/filetransferinstance.cpp \
+ src/corestructs.cpp \
+ src/widget/tool/chatactions/messageaction.cpp \
+ src/widget/tool/chatactions/filetransferaction.cpp \
+ src/widget/tool/chatactions/systemmessageaction.cpp \
+ src/widget/tool/chatactions/actionaction.cpp \
+ src/widget/maskablepixmapwidget.cpp \
+ src/cameraworker.cpp \
+ src/widget/videosurface.cpp
diff --git a/cameraworker.cpp b/src/cameraworker.cpp
similarity index 100%
rename from cameraworker.cpp
rename to src/cameraworker.cpp
diff --git a/cameraworker.h b/src/cameraworker.h
similarity index 100%
rename from cameraworker.h
rename to src/cameraworker.h
diff --git a/core.cpp b/src/core.cpp
similarity index 100%
rename from core.cpp
rename to src/core.cpp
diff --git a/core.h b/src/core.h
similarity index 100%
rename from core.h
rename to src/core.h
diff --git a/coreav.cpp b/src/coreav.cpp
similarity index 100%
rename from coreav.cpp
rename to src/coreav.cpp
diff --git a/coreav.h b/src/coreav.h
similarity index 100%
rename from coreav.h
rename to src/coreav.h
diff --git a/coredefines.h b/src/coredefines.h
similarity index 100%
rename from coredefines.h
rename to src/coredefines.h
diff --git a/corestructs.cpp b/src/corestructs.cpp
similarity index 100%
rename from corestructs.cpp
rename to src/corestructs.cpp
diff --git a/corestructs.h b/src/corestructs.h
similarity index 100%
rename from corestructs.h
rename to src/corestructs.h
diff --git a/filetransferinstance.cpp b/src/filetransferinstance.cpp
similarity index 100%
rename from filetransferinstance.cpp
rename to src/filetransferinstance.cpp
diff --git a/filetransferinstance.h b/src/filetransferinstance.h
similarity index 100%
rename from filetransferinstance.h
rename to src/filetransferinstance.h
diff --git a/friend.cpp b/src/friend.cpp
similarity index 100%
rename from friend.cpp
rename to src/friend.cpp
diff --git a/friend.h b/src/friend.h
similarity index 100%
rename from friend.h
rename to src/friend.h
diff --git a/friendlist.cpp b/src/friendlist.cpp
similarity index 100%
rename from friendlist.cpp
rename to src/friendlist.cpp
diff --git a/friendlist.h b/src/friendlist.h
similarity index 100%
rename from friendlist.h
rename to src/friendlist.h
diff --git a/group.cpp b/src/group.cpp
similarity index 100%
rename from group.cpp
rename to src/group.cpp
diff --git a/group.h b/src/group.h
similarity index 100%
rename from group.h
rename to src/group.h
diff --git a/grouplist.cpp b/src/grouplist.cpp
similarity index 100%
rename from grouplist.cpp
rename to src/grouplist.cpp
diff --git a/grouplist.h b/src/grouplist.h
similarity index 100%
rename from grouplist.h
rename to src/grouplist.h
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/mainwindow.ui b/src/mainwindow.ui
similarity index 99%
rename from mainwindow.ui
rename to src/mainwindow.ui
index 78c16d345..c143521da 100644
--- a/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1769,13 +1769,13 @@ QSplitter:handle{
AdjustingScrollArea
QScrollArea
- widget/adjustingscrollarea.h
+ src/widget/adjustingscrollarea.h
1
CroppingLabel
QLabel
-
+ src/widget/croppinglabel.h
diff --git a/misc/cdata.cpp b/src/misc/cdata.cpp
similarity index 100%
rename from misc/cdata.cpp
rename to src/misc/cdata.cpp
diff --git a/misc/cdata.h b/src/misc/cdata.h
similarity index 100%
rename from misc/cdata.h
rename to src/misc/cdata.h
diff --git a/misc/cstring.cpp b/src/misc/cstring.cpp
similarity index 100%
rename from misc/cstring.cpp
rename to src/misc/cstring.cpp
diff --git a/misc/cstring.h b/src/misc/cstring.h
similarity index 100%
rename from misc/cstring.h
rename to src/misc/cstring.h
diff --git a/misc/settings.cpp b/src/misc/settings.cpp
similarity index 100%
rename from misc/settings.cpp
rename to src/misc/settings.cpp
diff --git a/misc/settings.h b/src/misc/settings.h
similarity index 100%
rename from misc/settings.h
rename to src/misc/settings.h
diff --git a/misc/smileypack.cpp b/src/misc/smileypack.cpp
similarity index 100%
rename from misc/smileypack.cpp
rename to src/misc/smileypack.cpp
diff --git a/misc/smileypack.h b/src/misc/smileypack.h
similarity index 100%
rename from misc/smileypack.h
rename to src/misc/smileypack.h
diff --git a/misc/style.cpp b/src/misc/style.cpp
similarity index 100%
rename from misc/style.cpp
rename to src/misc/style.cpp
diff --git a/misc/style.h b/src/misc/style.h
similarity index 100%
rename from misc/style.h
rename to src/misc/style.h
diff --git a/videosource.h b/src/videosource.h
similarity index 100%
rename from videosource.h
rename to src/videosource.h
diff --git a/widget/adjustingscrollarea.cpp b/src/widget/adjustingscrollarea.cpp
similarity index 100%
rename from widget/adjustingscrollarea.cpp
rename to src/widget/adjustingscrollarea.cpp
diff --git a/widget/adjustingscrollarea.h b/src/widget/adjustingscrollarea.h
similarity index 100%
rename from widget/adjustingscrollarea.h
rename to src/widget/adjustingscrollarea.h
diff --git a/widget/camera.cpp b/src/widget/camera.cpp
similarity index 99%
rename from widget/camera.cpp
rename to src/widget/camera.cpp
index a92e3d256..5bf07e6df 100644
--- a/widget/camera.cpp
+++ b/src/widget/camera.cpp
@@ -16,7 +16,7 @@
#include "camera.h"
#include "widget.h"
-#include "cameraworker.h"
+#include "src/cameraworker.h"
#include
#include
diff --git a/widget/camera.h b/src/widget/camera.h
similarity index 98%
rename from widget/camera.h
rename to src/widget/camera.h
index 5503f696c..b63740191 100644
--- a/widget/camera.h
+++ b/src/widget/camera.h
@@ -22,7 +22,7 @@
#include
#include "vpx/vpx_image.h"
#include "opencv2/opencv.hpp"
-#include "videosource.h"
+#include "src/videosource.h"
class CameraWorker;
diff --git a/widget/chatareawidget.cpp b/src/widget/chatareawidget.cpp
similarity index 99%
rename from widget/chatareawidget.cpp
rename to src/widget/chatareawidget.cpp
index 2ce9fc267..542e3be40 100644
--- a/widget/chatareawidget.cpp
+++ b/src/widget/chatareawidget.cpp
@@ -15,7 +15,7 @@
*/
#include "chatareawidget.h"
-#include "widget/tool/chatactions/chataction.h"
+#include "tool/chatactions/chataction.h"
#include
#include
#include
diff --git a/widget/chatareawidget.h b/src/widget/chatareawidget.h
similarity index 100%
rename from widget/chatareawidget.h
rename to src/widget/chatareawidget.h
diff --git a/widget/croppinglabel.cpp b/src/widget/croppinglabel.cpp
similarity index 100%
rename from widget/croppinglabel.cpp
rename to src/widget/croppinglabel.cpp
diff --git a/widget/croppinglabel.h b/src/widget/croppinglabel.h
similarity index 100%
rename from widget/croppinglabel.h
rename to src/widget/croppinglabel.h
diff --git a/widget/emoticonswidget.cpp b/src/widget/emoticonswidget.cpp
similarity index 98%
rename from widget/emoticonswidget.cpp
rename to src/widget/emoticonswidget.cpp
index 8383c79a9..212d01f1a 100644
--- a/widget/emoticonswidget.cpp
+++ b/src/widget/emoticonswidget.cpp
@@ -15,8 +15,8 @@
*/
#include "emoticonswidget.h"
-#include "misc/smileypack.h"
-#include "misc/style.h"
+#include "src/misc/smileypack.h"
+#include "src/misc/style.h"
#include
#include
diff --git a/widget/emoticonswidget.h b/src/widget/emoticonswidget.h
similarity index 100%
rename from widget/emoticonswidget.h
rename to src/widget/emoticonswidget.h
diff --git a/widget/form/addfriendform.cpp b/src/widget/form/addfriendform.cpp
similarity index 99%
rename from widget/form/addfriendform.cpp
rename to src/widget/form/addfriendform.cpp
index 55f5e80dd..b31a7818e 100644
--- a/widget/form/addfriendform.cpp
+++ b/src/widget/form/addfriendform.cpp
@@ -20,7 +20,7 @@
#include
#include
#include "ui_mainwindow.h"
-#include "core.h"
+#include "src/core.h"
#define TOX_ID_LENGTH 2*TOX_FRIEND_ADDRESS_SIZE
diff --git a/widget/form/addfriendform.h b/src/widget/form/addfriendform.h
similarity index 100%
rename from widget/form/addfriendform.h
rename to src/widget/form/addfriendform.h
diff --git a/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
similarity index 97%
rename from widget/form/chatform.cpp
rename to src/widget/form/chatform.cpp
index a7e0a47b8..777a39b0a 100644
--- a/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -24,18 +24,18 @@
#include
#include
#include "chatform.h"
-#include "friend.h"
-#include "widget/friendwidget.h"
-#include "filetransferinstance.h"
-#include "widget/tool/chatactions/filetransferaction.h"
-#include "widget/netcamview.h"
-#include "widget/chatareawidget.h"
-#include "widget/tool/chattextedit.h"
-#include "core.h"
-#include "widget/widget.h"
-#include "widget/maskablepixmapwidget.h"
-#include "widget/croppinglabel.h"
-#include "misc/style.h"
+#include "src/friend.h"
+#include "src/widget/friendwidget.h"
+#include "src/filetransferinstance.h"
+#include "src/widget/tool/chatactions/filetransferaction.h"
+#include "src/widget/netcamview.h"
+#include "src/widget/chatareawidget.h"
+#include "src/widget/tool/chattextedit.h"
+#include "src/core.h"
+#include "src/widget/widget.h"
+#include "src/widget/maskablepixmapwidget.h"
+#include "src/widget/croppinglabel.h"
+#include "src/misc/style.h"
ChatForm::ChatForm(Friend* chatFriend)
: f(chatFriend)
diff --git a/widget/form/chatform.h b/src/widget/form/chatform.h
similarity index 98%
rename from widget/form/chatform.h
rename to src/widget/form/chatform.h
index 13eba9b7d..7d4a868b1 100644
--- a/widget/form/chatform.h
+++ b/src/widget/form/chatform.h
@@ -18,7 +18,7 @@
#define CHATFORM_H
#include "genericchatform.h"
-#include "corestructs.h"
+#include "src/corestructs.h"
struct Friend;
class FileTransferInstance;
diff --git a/widget/form/filesform.cpp b/src/widget/form/filesform.cpp
similarity index 100%
rename from widget/form/filesform.cpp
rename to src/widget/form/filesform.cpp
diff --git a/widget/form/filesform.h b/src/widget/form/filesform.h
similarity index 100%
rename from widget/form/filesform.h
rename to src/widget/form/filesform.h
diff --git a/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
similarity index 94%
rename from widget/form/genericchatform.cpp
rename to src/widget/form/genericchatform.cpp
index 08e8040bb..0d31288e1 100644
--- a/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -17,17 +17,17 @@
#include "genericchatform.h"
#include "ui_mainwindow.h"
#include
-#include "misc/smileypack.h"
-#include "widget/emoticonswidget.h"
-#include "misc/style.h"
-#include "widget/widget.h"
-#include "misc/settings.h"
-#include "widget/tool/chatactions/messageaction.h"
-#include "widget/tool/chatactions/systemmessageaction.h"
-#include "widget/tool/chatactions/actionaction.h"
-#include "widget/chatareawidget.h"
-#include "widget/tool/chattextedit.h"
-#include "widget/maskablepixmapwidget.h"
+#include "src/misc/smileypack.h"
+#include "src/widget/emoticonswidget.h"
+#include "src/misc/style.h"
+#include "src/widget/widget.h"
+#include "src/misc/settings.h"
+#include "src/widget/tool/chatactions/messageaction.h"
+#include "src/widget/tool/chatactions/systemmessageaction.h"
+#include "src/widget/tool/chatactions/actionaction.h"
+#include "src/widget/chatareawidget.h"
+#include "src/widget/tool/chattextedit.h"
+#include "src/widget/maskablepixmapwidget.h"
GenericChatForm::GenericChatForm(QWidget *parent) :
QWidget(parent)
diff --git a/widget/form/genericchatform.h b/src/widget/form/genericchatform.h
similarity index 100%
rename from widget/form/genericchatform.h
rename to src/widget/form/genericchatform.h
diff --git a/widget/form/groupchatform.cpp b/src/widget/form/groupchatform.cpp
similarity index 92%
rename from widget/form/groupchatform.cpp
rename to src/widget/form/groupchatform.cpp
index 5e97d22df..822304f58 100644
--- a/widget/form/groupchatform.cpp
+++ b/src/widget/form/groupchatform.cpp
@@ -15,13 +15,13 @@
*/
#include "groupchatform.h"
-#include "group.h"
-#include "widget/groupwidget.h"
-#include "widget/tool/chattextedit.h"
-#include "widget/croppinglabel.h"
-#include "widget/maskablepixmapwidget.h"
-#include "core.h"
-#include "misc/style.h"
+#include "src/group.h"
+#include "src/widget/groupwidget.h"
+#include "src/widget/tool/chattextedit.h"
+#include "src/widget/croppinglabel.h"
+#include "src/widget/maskablepixmapwidget.h"
+#include "src/core.h"
+#include "src/misc/style.h"
#include
#include
#include
diff --git a/widget/form/groupchatform.h b/src/widget/form/groupchatform.h
similarity index 100%
rename from widget/form/groupchatform.h
rename to src/widget/form/groupchatform.h
diff --git a/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp
similarity index 98%
rename from widget/form/settings/avform.cpp
rename to src/widget/form/settings/avform.cpp
index 4745bac2c..082097b5c 100644
--- a/widget/form/settings/avform.cpp
+++ b/src/widget/form/settings/avform.cpp
@@ -15,7 +15,7 @@
*/
#include "avform.h"
-#include "widget/camera.h"
+#include "src/widget/camera.h"
#include "ui_avsettings.h"
AVForm::AVForm() :
diff --git a/widget/form/settings/avform.h b/src/widget/form/settings/avform.h
similarity index 97%
rename from widget/form/settings/avform.h
rename to src/widget/form/settings/avform.h
index 978506418..0bcc953b7 100644
--- a/widget/form/settings/avform.h
+++ b/src/widget/form/settings/avform.h
@@ -18,7 +18,7 @@
#define AVFORM_H
#include "genericsettings.h"
-#include "widget/videosurface.h"
+#include "src/widget/videosurface.h"
#include
#include
#include
diff --git a/widget/form/settings/avsettings.ui b/src/widget/form/settings/avsettings.ui
similarity index 100%
rename from widget/form/settings/avsettings.ui
rename to src/widget/form/settings/avsettings.ui
diff --git a/widget/form/settings/generalform.cpp b/src/widget/form/settings/generalform.cpp
similarity index 96%
rename from widget/form/settings/generalform.cpp
rename to src/widget/form/settings/generalform.cpp
index 0df370048..3ac8bcf70 100644
--- a/widget/form/settings/generalform.cpp
+++ b/src/widget/form/settings/generalform.cpp
@@ -16,10 +16,10 @@
#include "ui_generalsettings.h"
#include "generalform.h"
-#include "widget/form/settingswidget.h"
-#include "widget/widget.h"
-#include "misc/settings.h"
-#include "misc/smileypack.h"
+#include "src/widget/form/settingswidget.h"
+#include "src/widget/widget.h"
+#include "src/misc/settings.h"
+#include "src/misc/smileypack.h"
#include
GeneralForm::GeneralForm() :
diff --git a/widget/form/settings/generalform.h b/src/widget/form/settings/generalform.h
similarity index 100%
rename from widget/form/settings/generalform.h
rename to src/widget/form/settings/generalform.h
diff --git a/widget/form/settings/generalsettings.ui b/src/widget/form/settings/generalsettings.ui
similarity index 100%
rename from widget/form/settings/generalsettings.ui
rename to src/widget/form/settings/generalsettings.ui
diff --git a/widget/form/settings/genericsettings.h b/src/widget/form/settings/genericsettings.h
similarity index 96%
rename from widget/form/settings/genericsettings.h
rename to src/widget/form/settings/genericsettings.h
index ba3791ada..3e2d54feb 100644
--- a/widget/form/settings/genericsettings.h
+++ b/src/widget/form/settings/genericsettings.h
@@ -18,7 +18,7 @@
#define GENERICFORM_H
#include
-#include "widget/form/settingswidget.h"
+#include "src/widget/form/settingswidget.h"
class GenericForm : public QWidget
{
diff --git a/widget/form/settings/identityform.cpp b/src/widget/form/settings/identityform.cpp
similarity index 95%
rename from widget/form/settings/identityform.cpp
rename to src/widget/form/settings/identityform.cpp
index 041fbdc94..b8369945e 100644
--- a/widget/form/settings/identityform.cpp
+++ b/src/widget/form/settings/identityform.cpp
@@ -14,12 +14,11 @@
See the COPYING file for more details.
*/
-#include "core.h"
+#include "src/core.h"
#include "ui_identitysettings.h"
#include "identityform.h"
-#include "widget/form/settingswidget.h"
-#include "widget/croppinglabel.h"
-#include "core.h"
+#include "src/widget/form/settingswidget.h"
+#include "src/widget/croppinglabel.h"
#include
#include
#include
diff --git a/widget/form/settings/identityform.h b/src/widget/form/settings/identityform.h
similarity index 100%
rename from widget/form/settings/identityform.h
rename to src/widget/form/settings/identityform.h
diff --git a/widget/form/settings/identitysettings.ui b/src/widget/form/settings/identitysettings.ui
similarity index 97%
rename from widget/form/settings/identitysettings.ui
rename to src/widget/form/settings/identitysettings.ui
index d27300155..67ee1a1ac 100644
--- a/widget/form/settings/identitysettings.ui
+++ b/src/widget/form/settings/identitysettings.ui
@@ -78,7 +78,7 @@
CroppingLabel
QLabel
-
+ src/widget/croppinglabel.h
diff --git a/widget/form/settings/privacyform.cpp b/src/widget/form/settings/privacyform.cpp
similarity index 94%
rename from widget/form/settings/privacyform.cpp
rename to src/widget/form/settings/privacyform.cpp
index c51dc0878..eb8ae2dd6 100644
--- a/widget/form/settings/privacyform.cpp
+++ b/src/widget/form/settings/privacyform.cpp
@@ -15,7 +15,7 @@
*/
#include "privacyform.h"
-#include "widget/form/settingswidget.h"
+#include "src/widget/form/settingswidget.h"
PrivacyForm::PrivacyForm() :
GenericForm(tr("Privacy settings"), QPixmap(":/img/settings/privacy.png"))
diff --git a/widget/form/settings/privacyform.h b/src/widget/form/settings/privacyform.h
similarity index 100%
rename from widget/form/settings/privacyform.h
rename to src/widget/form/settings/privacyform.h
diff --git a/widget/form/settingswidget.cpp b/src/widget/form/settingswidget.cpp
similarity index 90%
rename from widget/form/settingswidget.cpp
rename to src/widget/form/settingswidget.cpp
index 6ef030f53..b5f33a3bf 100644
--- a/widget/form/settingswidget.cpp
+++ b/src/widget/form/settingswidget.cpp
@@ -15,13 +15,13 @@
*/
#include "settingswidget.h"
-#include "widget/widget.h"
+#include "src/widget/widget.h"
#include "ui_mainwindow.h"
-#include "widget/camera.h"
-#include "widget/form/settings/generalform.h"
-#include "widget/form/settings/identityform.h"
-#include "widget/form/settings/privacyform.h"
-#include "widget/form/settings/avform.h"
+#include "src/widget/camera.h"
+#include "src/widget/form/settings/generalform.h"
+#include "src/widget/form/settings/identityform.h"
+#include "src/widget/form/settings/privacyform.h"
+#include "src/widget/form/settings/avform.h"
#include
#include
diff --git a/widget/form/settingswidget.h b/src/widget/form/settingswidget.h
similarity index 100%
rename from widget/form/settingswidget.h
rename to src/widget/form/settingswidget.h
diff --git a/widget/friendlistwidget.cpp b/src/widget/friendlistwidget.cpp
similarity index 100%
rename from widget/friendlistwidget.cpp
rename to src/widget/friendlistwidget.cpp
diff --git a/widget/friendlistwidget.h b/src/widget/friendlistwidget.h
similarity index 97%
rename from widget/friendlistwidget.h
rename to src/widget/friendlistwidget.h
index f8c3adf8c..ec44ba717 100644
--- a/widget/friendlistwidget.h
+++ b/src/widget/friendlistwidget.h
@@ -19,7 +19,7 @@
#include
#include
-#include "corestructs.h"
+#include "src/corestructs.h"
class QLayout;
class QGridLayout;
diff --git a/widget/friendwidget.cpp b/src/widget/friendwidget.cpp
similarity index 95%
rename from widget/friendwidget.cpp
rename to src/widget/friendwidget.cpp
index 2b830f107..9c320c767 100644
--- a/widget/friendwidget.cpp
+++ b/src/widget/friendwidget.cpp
@@ -15,16 +15,16 @@
*/
#include "friendwidget.h"
-#include "group.h"
-#include "grouplist.h"
+#include "src/group.h"
+#include "src/grouplist.h"
#include "groupwidget.h"
-#include "friendlist.h"
-#include "friend.h"
-#include "core.h"
-#include "widget/form/chatform.h"
-#include "widget/maskablepixmapwidget.h"
-#include "widget/croppinglabel.h"
-#include "misc/style.h"
+#include "src/friendlist.h"
+#include "src/friend.h"
+#include "src/core.h"
+#include "form/chatform.h"
+#include "maskablepixmapwidget.h"
+#include "croppinglabel.h"
+#include "src/misc/style.h"
#include
#include
#include
diff --git a/widget/friendwidget.h b/src/widget/friendwidget.h
similarity index 100%
rename from widget/friendwidget.h
rename to src/widget/friendwidget.h
diff --git a/widget/genericchatroomwidget.cpp b/src/widget/genericchatroomwidget.cpp
similarity index 97%
rename from widget/genericchatroomwidget.cpp
rename to src/widget/genericchatroomwidget.cpp
index 8e875bd3e..4a4e7198d 100644
--- a/widget/genericchatroomwidget.cpp
+++ b/src/widget/genericchatroomwidget.cpp
@@ -15,8 +15,8 @@
*/
#include "genericchatroomwidget.h"
-#include "misc/style.h"
-#include "widget/maskablepixmapwidget.h"
+#include "src/misc/style.h"
+#include "maskablepixmapwidget.h"
#include "croppinglabel.h"
#include
#include
diff --git a/widget/genericchatroomwidget.h b/src/widget/genericchatroomwidget.h
similarity index 100%
rename from widget/genericchatroomwidget.h
rename to src/widget/genericchatroomwidget.h
diff --git a/widget/groupwidget.cpp b/src/widget/groupwidget.cpp
similarity index 94%
rename from widget/groupwidget.cpp
rename to src/widget/groupwidget.cpp
index 05d04cf76..db45f8132 100644
--- a/widget/groupwidget.cpp
+++ b/src/widget/groupwidget.cpp
@@ -15,12 +15,12 @@
*/
#include "groupwidget.h"
-#include "grouplist.h"
-#include "group.h"
-#include "misc/settings.h"
-#include "widget/form/groupchatform.h"
-#include "widget/maskablepixmapwidget.h"
-#include "misc/style.h"
+#include "src/grouplist.h"
+#include "src/group.h"
+#include "src/misc/settings.h"
+#include "form/groupchatform.h"
+#include "maskablepixmapwidget.h"
+#include "src/misc/style.h"
#include
#include
#include
diff --git a/widget/groupwidget.h b/src/widget/groupwidget.h
similarity index 100%
rename from widget/groupwidget.h
rename to src/widget/groupwidget.h
diff --git a/widget/maskablepixmapwidget.cpp b/src/widget/maskablepixmapwidget.cpp
similarity index 100%
rename from widget/maskablepixmapwidget.cpp
rename to src/widget/maskablepixmapwidget.cpp
diff --git a/widget/maskablepixmapwidget.h b/src/widget/maskablepixmapwidget.h
similarity index 100%
rename from widget/maskablepixmapwidget.h
rename to src/widget/maskablepixmapwidget.h
diff --git a/widget/netcamview.cpp b/src/widget/netcamview.cpp
similarity index 99%
rename from widget/netcamview.cpp
rename to src/widget/netcamview.cpp
index fc94393d5..e5443674c 100644
--- a/widget/netcamview.cpp
+++ b/src/widget/netcamview.cpp
@@ -15,7 +15,7 @@
*/
#include "netcamview.h"
-#include "core.h"
+#include "src/core.h"
#include
#include
diff --git a/widget/netcamview.h b/src/widget/netcamview.h
similarity index 100%
rename from widget/netcamview.h
rename to src/widget/netcamview.h
diff --git a/widget/tool/chatactions/actionaction.cpp b/src/widget/tool/chatactions/actionaction.cpp
similarity index 98%
rename from widget/tool/chatactions/actionaction.cpp
rename to src/widget/tool/chatactions/actionaction.cpp
index 8533b7cd8..3facb978c 100644
--- a/widget/tool/chatactions/actionaction.cpp
+++ b/src/widget/tool/chatactions/actionaction.cpp
@@ -15,7 +15,7 @@
*/
#include "actionaction.h"
-#include "misc/smileypack.h"
+#include "src/misc/smileypack.h"
ActionAction::ActionAction(const QString &author, const QString &message, const QString &date, const bool& me) :
ChatAction(me, author, date),
diff --git a/widget/tool/chatactions/actionaction.h b/src/widget/tool/chatactions/actionaction.h
similarity index 95%
rename from widget/tool/chatactions/actionaction.h
rename to src/widget/tool/chatactions/actionaction.h
index ec4e5f4a8..08553a96e 100644
--- a/widget/tool/chatactions/actionaction.h
+++ b/src/widget/tool/chatactions/actionaction.h
@@ -17,7 +17,7 @@
#ifndef ACTIONACTION_H
#define ACTIONACTION_H
-#include "widget/tool/chatactions/chataction.h"
+#include "chataction.h"
class ActionAction : public ChatAction
{
diff --git a/widget/tool/chatactions/chataction.cpp b/src/widget/tool/chatactions/chataction.cpp
similarity index 100%
rename from widget/tool/chatactions/chataction.cpp
rename to src/widget/tool/chatactions/chataction.cpp
diff --git a/widget/tool/chatactions/chataction.h b/src/widget/tool/chatactions/chataction.h
similarity index 100%
rename from widget/tool/chatactions/chataction.h
rename to src/widget/tool/chatactions/chataction.h
diff --git a/widget/tool/chatactions/filetransferaction.cpp b/src/widget/tool/chatactions/filetransferaction.cpp
similarity index 98%
rename from widget/tool/chatactions/filetransferaction.cpp
rename to src/widget/tool/chatactions/filetransferaction.cpp
index 59f2c9250..910055c26 100644
--- a/widget/tool/chatactions/filetransferaction.cpp
+++ b/src/widget/tool/chatactions/filetransferaction.cpp
@@ -15,7 +15,7 @@
*/
#include "filetransferaction.h"
-#include "filetransferinstance.h"
+#include "src/filetransferinstance.h"
#include
#include
diff --git a/widget/tool/chatactions/filetransferaction.h b/src/widget/tool/chatactions/filetransferaction.h
similarity index 96%
rename from widget/tool/chatactions/filetransferaction.h
rename to src/widget/tool/chatactions/filetransferaction.h
index 31982cd45..c6e1340cd 100644
--- a/widget/tool/chatactions/filetransferaction.h
+++ b/src/widget/tool/chatactions/filetransferaction.h
@@ -17,7 +17,7 @@
#ifndef FILETRANSFERACTION_H
#define FILETRANSFERACTION_H
-#include "widget/tool/chatactions/chataction.h"
+#include "chataction.h"
class FileTransferAction : public ChatAction
{
diff --git a/widget/tool/chatactions/messageaction.cpp b/src/widget/tool/chatactions/messageaction.cpp
similarity index 98%
rename from widget/tool/chatactions/messageaction.cpp
rename to src/widget/tool/chatactions/messageaction.cpp
index 6445279ea..4a8b6962b 100644
--- a/widget/tool/chatactions/messageaction.cpp
+++ b/src/widget/tool/chatactions/messageaction.cpp
@@ -15,7 +15,7 @@
*/
#include "messageaction.h"
-#include "misc/smileypack.h"
+#include "src/misc/smileypack.h"
MessageAction::MessageAction(const QString &author, const QString &message, const QString &date, const bool &me) :
ChatAction(me, author, date),
diff --git a/widget/tool/chatactions/messageaction.h b/src/widget/tool/chatactions/messageaction.h
similarity index 95%
rename from widget/tool/chatactions/messageaction.h
rename to src/widget/tool/chatactions/messageaction.h
index 65f8e6465..aa32801eb 100644
--- a/widget/tool/chatactions/messageaction.h
+++ b/src/widget/tool/chatactions/messageaction.h
@@ -17,7 +17,7 @@
#ifndef MESSAGEACTION_H
#define MESSAGEACTION_H
-#include "widget/tool/chatactions/chataction.h"
+#include "chataction.h"
class MessageAction : public ChatAction
{
diff --git a/widget/tool/chatactions/systemmessageaction.cpp b/src/widget/tool/chatactions/systemmessageaction.cpp
similarity index 100%
rename from widget/tool/chatactions/systemmessageaction.cpp
rename to src/widget/tool/chatactions/systemmessageaction.cpp
diff --git a/widget/tool/chatactions/systemmessageaction.h b/src/widget/tool/chatactions/systemmessageaction.h
similarity index 95%
rename from widget/tool/chatactions/systemmessageaction.h
rename to src/widget/tool/chatactions/systemmessageaction.h
index 6767a3f73..737458d11 100644
--- a/widget/tool/chatactions/systemmessageaction.h
+++ b/src/widget/tool/chatactions/systemmessageaction.h
@@ -17,7 +17,7 @@
#ifndef SYSTEMMESSAGEACTION_H
#define SYSTEMMESSAGEACTION_H
-#include "widget/tool/chatactions/chataction.h"
+#include "chataction.h"
class SystemMessageAction : public ChatAction
{
diff --git a/widget/tool/chattextedit.cpp b/src/widget/tool/chattextedit.cpp
similarity index 100%
rename from widget/tool/chattextedit.cpp
rename to src/widget/tool/chattextedit.cpp
diff --git a/widget/tool/chattextedit.h b/src/widget/tool/chattextedit.h
similarity index 100%
rename from widget/tool/chattextedit.h
rename to src/widget/tool/chattextedit.h
diff --git a/widget/tool/friendrequestdialog.cpp b/src/widget/tool/friendrequestdialog.cpp
similarity index 100%
rename from widget/tool/friendrequestdialog.cpp
rename to src/widget/tool/friendrequestdialog.cpp
diff --git a/widget/tool/friendrequestdialog.h b/src/widget/tool/friendrequestdialog.h
similarity index 100%
rename from widget/tool/friendrequestdialog.h
rename to src/widget/tool/friendrequestdialog.h
diff --git a/widget/videosurface.cpp b/src/widget/videosurface.cpp
similarity index 100%
rename from widget/videosurface.cpp
rename to src/widget/videosurface.cpp
diff --git a/widget/videosurface.h b/src/widget/videosurface.h
similarity index 100%
rename from widget/videosurface.h
rename to src/widget/videosurface.h
diff --git a/widget/widget.cpp b/src/widget/widget.cpp
similarity index 98%
rename from widget/widget.cpp
rename to src/widget/widget.cpp
index 20efebaec..ecf653947 100644
--- a/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -16,21 +16,21 @@
#include "widget.h"
#include "ui_mainwindow.h"
-#include "core.h"
-#include "misc/settings.h"
-#include "friend.h"
-#include "friendlist.h"
-#include "widget/tool/friendrequestdialog.h"
-#include "widget/friendwidget.h"
-#include "grouplist.h"
-#include "group.h"
-#include "widget/groupwidget.h"
-#include "widget/form/groupchatform.h"
-#include "misc/style.h"
-#include "widget/friendlistwidget.h"
+#include "src/core.h"
+#include "src/misc/settings.h"
+#include "src/friend.h"
+#include "src/friendlist.h"
+#include "tool/friendrequestdialog.h"
+#include "friendwidget.h"
+#include "src/grouplist.h"
+#include "src/group.h"
+#include "groupwidget.h"
+#include "form/groupchatform.h"
+#include "src/misc/style.h"
+#include "friendlistwidget.h"
#include "camera.h"
-#include "widget/form/chatform.h"
-#include "widget/maskablepixmapwidget.h"
+#include "form/chatform.h"
+#include "maskablepixmapwidget.h"
#include
#include
#include
diff --git a/widget/widget.h b/src/widget/widget.h
similarity index 95%
rename from widget/widget.h
rename to src/widget/widget.h
index 84423f26b..45953a206 100644
--- a/widget/widget.h
+++ b/src/widget/widget.h
@@ -18,11 +18,11 @@
#define WIDGET_H
#include
-#include "widget/form/addfriendform.h"
-#include "widget/form/settingswidget.h"
-#include "widget/form/settings/identityform.h"
-#include "widget/form/filesform.h"
-#include "corestructs.h"
+#include "form/addfriendform.h"
+#include "form/settingswidget.h"
+#include "form/settings/identityform.h"
+#include "form/filesform.h"
+#include "src/corestructs.h"
#define PIXELS_TO_ACT 7