Merge branch 'master' into history

Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/settings/privacyform.cpp

qtox.pro

@@ -26,12 +26,13 @@ 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 \
-    widget/form/settings/privacysettings.ui \
-    widget/form/loadhistorydialog.ui
+    src/mainwindow.ui \
+    src/widget/form/settings/generalsettings.ui \
+    src/widget/form/settings/avsettings.ui \
+    src/widget/form/settings/identitysettings.ui \
+    src/widget/form/settings/privacysettings.ui \
+    src/widget/form/loadhistorydialog.ui
+    
 CONFIG   += c++11
 
 TRANSLATIONS = translations/de.ts \
@@ -90,101 +91,101 @@ 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 \
-    historykeeper.h \
-    widget/form/loadhistorydialog.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 \
+    src/widget/form/loadhistorydialog.h \
+    src/historykeeper.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 \
-    historykeeper.cpp \
-    widget/form/loadhistorydialog.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 \
+    src/widget/form/loadhistorydialog.cpp \
+    src/historykeeper.cpp

src/mainwindow.ui

@@ -1769,13 +1769,13 @@ QSplitter:handle{
   <customwidget>
    <class>AdjustingScrollArea</class>
    <extends>QScrollArea</extends>
-   <header>widget/adjustingscrollarea.h</header>
+   <header>src/widget/adjustingscrollarea.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>CroppingLabel</class>
    <extends>QLabel</extends>
-   <header>widget/croppinglabel.h</header>
+   <header>src/widget/croppinglabel.h</header>
   </customwidget>
  </customwidgets>
  <resources>

src/widget/camera.cpp

@@ -16,7 +16,7 @@
 
 #include "camera.h"
 #include "widget.h"
-#include "cameraworker.h"
+#include "src/cameraworker.h"
 #include <QDebug>
 #include <QThread>
 

src/widget/camera.h

@@ -22,7 +22,7 @@
 #include <QMutex>
 #include "vpx/vpx_image.h"
 #include "opencv2/opencv.hpp"
-#include "videosource.h"
+#include "src/videosource.h"
 
 class CameraWorker;
 

src/widget/chatareawidget.cpp

@@ -15,7 +15,7 @@
 */
 
 #include "chatareawidget.h"
-#include "widget/tool/chatactions/chataction.h"
+#include "tool/chatactions/chataction.h"
 #include <QScrollBar>
 #include <QDesktopServices>
 #include <QTextTable>

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 <QPushButton>
 #include <QRadioButton>

src/widget/form/addfriendform.cpp

@@ -20,7 +20,7 @@
 #include <QMessageBox>
 #include <tox/tox.h>
 #include "ui_mainwindow.h"
-#include "core.h"
+#include "src/core.h"
 
 #define TOX_ID_LENGTH 2*TOX_FRIEND_ADDRESS_SIZE
 

src/widget/form/chatform.cpp

@@ -24,20 +24,20 @@
 #include <QDragEnterEvent>
 #include <QBitmap>
 #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 "historykeeper.h"
-#include "loadhistorydialog.h"
+#include "src/historykeeper.h"
+#include "src/widget/form/loadhistorydialog.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)

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;

src/widget/form/genericchatform.cpp

@@ -17,17 +17,17 @@
 #include "genericchatform.h"
 #include "ui_mainwindow.h"
 #include <QFileDialog>
-#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),

src/widget/form/groupchatform.cpp

@@ -15,17 +15,17 @@
 */
 
 #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 <QPushButton>
 #include <QMimeData>
 #include <QDragEnterEvent>
-#include "historykeeper.h"
+#include "src/historykeeper.h"
 
 GroupChatForm::GroupChatForm(Group* chatGroup)
     : group(chatGroup)

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() :

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 <QGroupBox>
 #include <QVBoxLayout>
 #include <QPushButton>

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 <QMessageBox>
 
 GeneralForm::GeneralForm() :

src/widget/form/settings/genericsettings.h

@@ -18,7 +18,7 @@
 #define GENERICFORM_H
 
 #include <QWidget>
-#include "widget/form/settingswidget.h"
+#include "src/widget/form/settingswidget.h"
 
 class GenericForm : public QWidget
 {

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 <QLabel>
 #include <QLineEdit>
 #include <QApplication>

src/widget/form/settings/identitysettings.ui

@@ -78,7 +78,7 @@
   <customwidget>
    <class>CroppingLabel</class>
    <extends>QLabel</extends>
-   <header>widget/croppinglabel.h</header>
+   <header>src/widget/croppinglabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/widget/form/settings/privacyform.cpp

@@ -16,9 +16,9 @@
 
 #include "privacyform.h"
 #include "ui_privacysettings.h"
-#include "widget/form/settingswidget.h"
-#include "misc/settings.h"
-#include "historykeeper.h"
+#include "src/widget/form/settingswidget.h"
+#include "src/misc/settings.h"
+#include "src/historykeeper.h"
 
 PrivacyForm::PrivacyForm() :
     GenericForm(tr("Privacy settings"), QPixmap(":/img/settings/privacy.png"))

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 <QTabBar>
 #include <QStackedWidget>
 

src/widget/friendlistwidget.h

@@ -19,7 +19,7 @@
 
 #include <QWidget>
 #include <QHash>
-#include "corestructs.h"
+#include "src/corestructs.h"
 
 class QLayout;
 class QGridLayout;

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 <QContextMenuEvent>
 #include <QMenu>
 #include <QDrag>

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 <QMouseEvent>
 #include <QStyle>

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 <QPalette>
 #include <QMenu>
 #include <QContextMenuEvent>

src/widget/netcamview.cpp

@@ -15,7 +15,7 @@
 */
 
 #include "netcamview.h"
-#include "core.h"
+#include "src/core.h"
 #include <QLabel>
 #include <QHBoxLayout>
 

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),

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
 {

src/widget/tool/chatactions/filetransferaction.cpp

@@ -15,7 +15,7 @@
 */
 
 #include "filetransferaction.h"
-#include "filetransferinstance.h"
+#include "src/filetransferinstance.h"
 
 #include <QTextEdit>
 #include <QScrollBar>

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
 {

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),

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
 {

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
 {