1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #405 from dubslow/src

Move code into src/
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-10-12 11:45:42 +02:00
commit e33a37c52c
97 changed files with 198 additions and 199 deletions

192
qtox.pro
View File

@ -26,10 +26,10 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = qtox TARGET = qtox
TEMPLATE = app TEMPLATE = app
FORMS += \ FORMS += \
mainwindow.ui \ src/mainwindow.ui \
widget/form/settings/generalsettings.ui \ src/widget/form/settings/generalsettings.ui \
widget/form/settings/avsettings.ui \ src/widget/form/settings/avsettings.ui \
widget/form/settings/identitysettings.ui src/widget/form/settings/identitysettings.ui
CONFIG += c++11 CONFIG += c++11
TRANSLATIONS = translations/de.ts \ TRANSLATIONS = translations/de.ts \
@ -88,97 +88,97 @@ win32 {
# -pthread -lrt -lGL -lpthread -Wl,-Bdynamic -ldl -lc # -pthread -lrt -lGL -lpthread -Wl,-Bdynamic -ldl -lc
#QMAKE_CXXFLAGS += -Os -flto -static-libstdc++ -static-libgcc #QMAKE_CXXFLAGS += -Os -flto -static-libstdc++ -static-libgcc
HEADERS += widget/form/addfriendform.h \ HEADERS += src/widget/form/addfriendform.h \
widget/form/chatform.h \ src/widget/form/chatform.h \
widget/form/groupchatform.h \ src/widget/form/groupchatform.h \
widget/form/settingswidget.h \ src/widget/form/settingswidget.h \
widget/form/settings/genericsettings.h \ src/widget/form/settings/genericsettings.h \
widget/form/settings/generalform.h \ src/widget/form/settings/generalform.h \
widget/form/settings/identityform.h \ src/widget/form/settings/identityform.h \
widget/form/settings/privacyform.h \ src/widget/form/settings/privacyform.h \
widget/form/settings/avform.h \ src/widget/form/settings/avform.h \
widget/form/filesform.h \ src/widget/form/filesform.h \
widget/tool/chattextedit.h \ src/widget/tool/chattextedit.h \
widget/tool/friendrequestdialog.h \ src/widget/tool/friendrequestdialog.h \
widget/friendwidget.h \ src/widget/friendwidget.h \
widget/groupwidget.h \ src/widget/groupwidget.h \
widget/widget.h \ src/widget/widget.h \
friend.h \ src/friend.h \
group.h \ src/group.h \
grouplist.h \ src/grouplist.h \
misc/settings.h \ src/misc/settings.h \
core.h \ src/core.h \
friendlist.h \ src/friendlist.h \
misc/cdata.h \ src/misc/cdata.h \
misc/cstring.h \ src/misc/cstring.h \
widget/camera.h \ src/widget/camera.h \
widget/netcamview.h \ src/widget/netcamview.h \
misc/smileypack.h \ src/misc/smileypack.h \
widget/emoticonswidget.h \ src/widget/emoticonswidget.h \
misc/style.h \ src/misc/style.h \
widget/adjustingscrollarea.h \ src/widget/adjustingscrollarea.h \
widget/croppinglabel.h \ src/widget/croppinglabel.h \
widget/friendlistwidget.h \ src/widget/friendlistwidget.h \
widget/genericchatroomwidget.h \ src/widget/genericchatroomwidget.h \
widget/form/genericchatform.h \ src/widget/form/genericchatform.h \
widget/tool/chatactions/chataction.h \ src/widget/tool/chatactions/chataction.h \
widget/chatareawidget.h \ src/widget/chatareawidget.h \
filetransferinstance.h \ src/filetransferinstance.h \
corestructs.h \ src/corestructs.h \
coredefines.h \ src/coredefines.h \
coreav.h \ src/coreav.h \
widget/tool/chatactions/messageaction.h \ src/widget/tool/chatactions/messageaction.h \
widget/tool/chatactions/filetransferaction.h \ src/widget/tool/chatactions/filetransferaction.h \
widget/tool/chatactions/systemmessageaction.h \ src/widget/tool/chatactions/systemmessageaction.h \
widget/tool/chatactions/actionaction.h \ src/widget/tool/chatactions/actionaction.h \
widget/maskablepixmapwidget.h \ src/widget/maskablepixmapwidget.h \
videosource.h \ src/videosource.h \
cameraworker.h \ src/cameraworker.h \
widget/videosurface.h src/widget/videosurface.h
SOURCES += \ SOURCES += \
widget/form/addfriendform.cpp \ src/widget/form/addfriendform.cpp \
widget/form/chatform.cpp \ src/widget/form/chatform.cpp \
widget/form/groupchatform.cpp \ src/widget/form/groupchatform.cpp \
widget/form/settingswidget.cpp \ src/widget/form/settingswidget.cpp \
widget/form/settings/generalform.cpp \ src/widget/form/settings/generalform.cpp \
widget/form/settings/identityform.cpp \ src/widget/form/settings/identityform.cpp \
widget/form/settings/privacyform.cpp \ src/widget/form/settings/privacyform.cpp \
widget/form/settings/avform.cpp \ src/widget/form/settings/avform.cpp \
widget/form/filesform.cpp \ src/widget/form/filesform.cpp \
widget/tool/chattextedit.cpp \ src/widget/tool/chattextedit.cpp \
widget/tool/friendrequestdialog.cpp \ src/widget/tool/friendrequestdialog.cpp \
widget/friendwidget.cpp \ src/widget/friendwidget.cpp \
widget/groupwidget.cpp \ src/widget/groupwidget.cpp \
widget/widget.cpp \ src/widget/widget.cpp \
core.cpp \ src/core.cpp \
friend.cpp \ src/friend.cpp \
friendlist.cpp \ src/friendlist.cpp \
group.cpp \ src/group.cpp \
grouplist.cpp \ src/grouplist.cpp \
main.cpp \ src/main.cpp \
misc/settings.cpp \ src/misc/settings.cpp \
misc/cdata.cpp \ src/misc/cdata.cpp \
misc/cstring.cpp \ src/misc/cstring.cpp \
widget/camera.cpp \ src/widget/camera.cpp \
widget/netcamview.cpp \ src/widget/netcamview.cpp \
misc/smileypack.cpp \ src/misc/smileypack.cpp \
widget/emoticonswidget.cpp \ src/widget/emoticonswidget.cpp \
misc/style.cpp \ src/misc/style.cpp \
widget/adjustingscrollarea.cpp \ src/widget/adjustingscrollarea.cpp \
widget/croppinglabel.cpp \ src/widget/croppinglabel.cpp \
widget/friendlistwidget.cpp \ src/widget/friendlistwidget.cpp \
coreav.cpp \ src/coreav.cpp \
widget/genericchatroomwidget.cpp \ src/widget/genericchatroomwidget.cpp \
widget/form/genericchatform.cpp \ src/widget/form/genericchatform.cpp \
widget/tool/chatactions/chataction.cpp \ src/widget/tool/chatactions/chataction.cpp \
widget/chatareawidget.cpp \ src/widget/chatareawidget.cpp \
filetransferinstance.cpp \ src/filetransferinstance.cpp \
corestructs.cpp \ src/corestructs.cpp \
widget/tool/chatactions/messageaction.cpp \ src/widget/tool/chatactions/messageaction.cpp \
widget/tool/chatactions/filetransferaction.cpp \ src/widget/tool/chatactions/filetransferaction.cpp \
widget/tool/chatactions/systemmessageaction.cpp \ src/widget/tool/chatactions/systemmessageaction.cpp \
widget/tool/chatactions/actionaction.cpp \ src/widget/tool/chatactions/actionaction.cpp \
widget/maskablepixmapwidget.cpp \ src/widget/maskablepixmapwidget.cpp \
cameraworker.cpp \ src/cameraworker.cpp \
widget/videosurface.cpp src/widget/videosurface.cpp

View File

View File

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

View File

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

View File

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

View File

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

View File

@ -15,8 +15,8 @@
*/ */
#include "emoticonswidget.h" #include "emoticonswidget.h"
#include "misc/smileypack.h" #include "src/misc/smileypack.h"
#include "misc/style.h" #include "src/misc/style.h"
#include <QPushButton> #include <QPushButton>
#include <QRadioButton> #include <QRadioButton>

View File

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

View File

@ -24,18 +24,18 @@
#include <QDragEnterEvent> #include <QDragEnterEvent>
#include <QBitmap> #include <QBitmap>
#include "chatform.h" #include "chatform.h"
#include "friend.h" #include "src/friend.h"
#include "widget/friendwidget.h" #include "src/widget/friendwidget.h"
#include "filetransferinstance.h" #include "src/filetransferinstance.h"
#include "widget/tool/chatactions/filetransferaction.h" #include "src/widget/tool/chatactions/filetransferaction.h"
#include "widget/netcamview.h" #include "src/widget/netcamview.h"
#include "widget/chatareawidget.h" #include "src/widget/chatareawidget.h"
#include "widget/tool/chattextedit.h" #include "src/widget/tool/chattextedit.h"
#include "core.h" #include "src/core.h"
#include "widget/widget.h" #include "src/widget/widget.h"
#include "widget/maskablepixmapwidget.h" #include "src/widget/maskablepixmapwidget.h"
#include "widget/croppinglabel.h" #include "src/widget/croppinglabel.h"
#include "misc/style.h" #include "src/misc/style.h"
ChatForm::ChatForm(Friend* chatFriend) ChatForm::ChatForm(Friend* chatFriend)
: f(chatFriend) : f(chatFriend)

View File

@ -18,7 +18,7 @@
#define CHATFORM_H #define CHATFORM_H
#include "genericchatform.h" #include "genericchatform.h"
#include "corestructs.h" #include "src/corestructs.h"
struct Friend; struct Friend;
class FileTransferInstance; class FileTransferInstance;

View File

@ -17,17 +17,17 @@
#include "genericchatform.h" #include "genericchatform.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include <QFileDialog> #include <QFileDialog>
#include "misc/smileypack.h" #include "src/misc/smileypack.h"
#include "widget/emoticonswidget.h" #include "src/widget/emoticonswidget.h"
#include "misc/style.h" #include "src/misc/style.h"
#include "widget/widget.h" #include "src/widget/widget.h"
#include "misc/settings.h" #include "src/misc/settings.h"
#include "widget/tool/chatactions/messageaction.h" #include "src/widget/tool/chatactions/messageaction.h"
#include "widget/tool/chatactions/systemmessageaction.h" #include "src/widget/tool/chatactions/systemmessageaction.h"
#include "widget/tool/chatactions/actionaction.h" #include "src/widget/tool/chatactions/actionaction.h"
#include "widget/chatareawidget.h" #include "src/widget/chatareawidget.h"
#include "widget/tool/chattextedit.h" #include "src/widget/tool/chattextedit.h"
#include "widget/maskablepixmapwidget.h" #include "src/widget/maskablepixmapwidget.h"
GenericChatForm::GenericChatForm(QWidget *parent) : GenericChatForm::GenericChatForm(QWidget *parent) :
QWidget(parent) QWidget(parent)

View File

@ -15,13 +15,13 @@
*/ */
#include "groupchatform.h" #include "groupchatform.h"
#include "group.h" #include "src/group.h"
#include "widget/groupwidget.h" #include "src/widget/groupwidget.h"
#include "widget/tool/chattextedit.h" #include "src/widget/tool/chattextedit.h"
#include "widget/croppinglabel.h" #include "src/widget/croppinglabel.h"
#include "widget/maskablepixmapwidget.h" #include "src/widget/maskablepixmapwidget.h"
#include "core.h" #include "src/core.h"
#include "misc/style.h" #include "src/misc/style.h"
#include <QPushButton> #include <QPushButton>
#include <QMimeData> #include <QMimeData>
#include <QDragEnterEvent> #include <QDragEnterEvent>

View File

@ -15,7 +15,7 @@
*/ */
#include "avform.h" #include "avform.h"
#include "widget/camera.h" #include "src/widget/camera.h"
#include "ui_avsettings.h" #include "ui_avsettings.h"
AVForm::AVForm() : AVForm::AVForm() :

View File

@ -18,7 +18,7 @@
#define AVFORM_H #define AVFORM_H
#include "genericsettings.h" #include "genericsettings.h"
#include "widget/videosurface.h" #include "src/widget/videosurface.h"
#include <QGroupBox> #include <QGroupBox>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QPushButton> #include <QPushButton>

View File

@ -16,10 +16,10 @@
#include "ui_generalsettings.h" #include "ui_generalsettings.h"
#include "generalform.h" #include "generalform.h"
#include "widget/form/settingswidget.h" #include "src/widget/form/settingswidget.h"
#include "widget/widget.h" #include "src/widget/widget.h"
#include "misc/settings.h" #include "src/misc/settings.h"
#include "misc/smileypack.h" #include "src/misc/smileypack.h"
#include <QMessageBox> #include <QMessageBox>
GeneralForm::GeneralForm() : GeneralForm::GeneralForm() :

View File

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

View File

@ -14,12 +14,11 @@
See the COPYING file for more details. See the COPYING file for more details.
*/ */
#include "core.h" #include "src/core.h"
#include "ui_identitysettings.h" #include "ui_identitysettings.h"
#include "identityform.h" #include "identityform.h"
#include "widget/form/settingswidget.h" #include "src/widget/form/settingswidget.h"
#include "widget/croppinglabel.h" #include "src/widget/croppinglabel.h"
#include "core.h"
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
#include <QApplication> #include <QApplication>

View File

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

View File

@ -15,7 +15,7 @@
*/ */
#include "privacyform.h" #include "privacyform.h"
#include "widget/form/settingswidget.h" #include "src/widget/form/settingswidget.h"
PrivacyForm::PrivacyForm() : PrivacyForm::PrivacyForm() :
GenericForm(tr("Privacy settings"), QPixmap(":/img/settings/privacy.png")) GenericForm(tr("Privacy settings"), QPixmap(":/img/settings/privacy.png"))

View File

@ -15,13 +15,13 @@
*/ */
#include "settingswidget.h" #include "settingswidget.h"
#include "widget/widget.h" #include "src/widget/widget.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "widget/camera.h" #include "src/widget/camera.h"
#include "widget/form/settings/generalform.h" #include "src/widget/form/settings/generalform.h"
#include "widget/form/settings/identityform.h" #include "src/widget/form/settings/identityform.h"
#include "widget/form/settings/privacyform.h" #include "src/widget/form/settings/privacyform.h"
#include "widget/form/settings/avform.h" #include "src/widget/form/settings/avform.h"
#include <QTabBar> #include <QTabBar>
#include <QStackedWidget> #include <QStackedWidget>

View File

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

View File

@ -15,16 +15,16 @@
*/ */
#include "friendwidget.h" #include "friendwidget.h"
#include "group.h" #include "src/group.h"
#include "grouplist.h" #include "src/grouplist.h"
#include "groupwidget.h" #include "groupwidget.h"
#include "friendlist.h" #include "src/friendlist.h"
#include "friend.h" #include "src/friend.h"
#include "core.h" #include "src/core.h"
#include "widget/form/chatform.h" #include "form/chatform.h"
#include "widget/maskablepixmapwidget.h" #include "maskablepixmapwidget.h"
#include "widget/croppinglabel.h" #include "croppinglabel.h"
#include "misc/style.h" #include "src/misc/style.h"
#include <QContextMenuEvent> #include <QContextMenuEvent>
#include <QMenu> #include <QMenu>
#include <QDrag> #include <QDrag>

View File

@ -15,8 +15,8 @@
*/ */
#include "genericchatroomwidget.h" #include "genericchatroomwidget.h"
#include "misc/style.h" #include "src/misc/style.h"
#include "widget/maskablepixmapwidget.h" #include "maskablepixmapwidget.h"
#include "croppinglabel.h" #include "croppinglabel.h"
#include <QMouseEvent> #include <QMouseEvent>
#include <QStyle> #include <QStyle>

View File

@ -15,12 +15,12 @@
*/ */
#include "groupwidget.h" #include "groupwidget.h"
#include "grouplist.h" #include "src/grouplist.h"
#include "group.h" #include "src/group.h"
#include "misc/settings.h" #include "src/misc/settings.h"
#include "widget/form/groupchatform.h" #include "form/groupchatform.h"
#include "widget/maskablepixmapwidget.h" #include "maskablepixmapwidget.h"
#include "misc/style.h" #include "src/misc/style.h"
#include <QPalette> #include <QPalette>
#include <QMenu> #include <QMenu>
#include <QContextMenuEvent> #include <QContextMenuEvent>

View File

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

View File

@ -15,7 +15,7 @@
*/ */
#include "actionaction.h" #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) : ActionAction::ActionAction(const QString &author, const QString &message, const QString &date, const bool& me) :
ChatAction(me, author, date), ChatAction(me, author, date),

View File

@ -17,7 +17,7 @@
#ifndef ACTIONACTION_H #ifndef ACTIONACTION_H
#define ACTIONACTION_H #define ACTIONACTION_H
#include "widget/tool/chatactions/chataction.h" #include "chataction.h"
class ActionAction : public ChatAction class ActionAction : public ChatAction
{ {

View File

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

View File

@ -17,7 +17,7 @@
#ifndef FILETRANSFERACTION_H #ifndef FILETRANSFERACTION_H
#define FILETRANSFERACTION_H #define FILETRANSFERACTION_H
#include "widget/tool/chatactions/chataction.h" #include "chataction.h"
class FileTransferAction : public ChatAction class FileTransferAction : public ChatAction
{ {

View File

@ -15,7 +15,7 @@
*/ */
#include "messageaction.h" #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) : MessageAction::MessageAction(const QString &author, const QString &message, const QString &date, const bool &me) :
ChatAction(me, author, date), ChatAction(me, author, date),

View File

@ -17,7 +17,7 @@
#ifndef MESSAGEACTION_H #ifndef MESSAGEACTION_H
#define MESSAGEACTION_H #define MESSAGEACTION_H
#include "widget/tool/chatactions/chataction.h" #include "chataction.h"
class MessageAction : public ChatAction class MessageAction : public ChatAction
{ {

View File

@ -17,7 +17,7 @@
#ifndef SYSTEMMESSAGEACTION_H #ifndef SYSTEMMESSAGEACTION_H
#define SYSTEMMESSAGEACTION_H #define SYSTEMMESSAGEACTION_H
#include "widget/tool/chatactions/chataction.h" #include "chataction.h"
class SystemMessageAction : public ChatAction class SystemMessageAction : public ChatAction
{ {

View File

@ -16,21 +16,21 @@
#include "widget.h" #include "widget.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "core.h" #include "src/core.h"
#include "misc/settings.h" #include "src/misc/settings.h"
#include "friend.h" #include "src/friend.h"
#include "friendlist.h" #include "src/friendlist.h"
#include "widget/tool/friendrequestdialog.h" #include "tool/friendrequestdialog.h"
#include "widget/friendwidget.h" #include "friendwidget.h"
#include "grouplist.h" #include "src/grouplist.h"
#include "group.h" #include "src/group.h"
#include "widget/groupwidget.h" #include "groupwidget.h"
#include "widget/form/groupchatform.h" #include "form/groupchatform.h"
#include "misc/style.h" #include "src/misc/style.h"
#include "widget/friendlistwidget.h" #include "friendlistwidget.h"
#include "camera.h" #include "camera.h"
#include "widget/form/chatform.h" #include "form/chatform.h"
#include "widget/maskablepixmapwidget.h" #include "maskablepixmapwidget.h"
#include <QMessageBox> #include <QMessageBox>
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>

View File

@ -18,11 +18,11 @@
#define WIDGET_H #define WIDGET_H
#include <QMainWindow> #include <QMainWindow>
#include "widget/form/addfriendform.h" #include "form/addfriendform.h"
#include "widget/form/settingswidget.h" #include "form/settingswidget.h"
#include "widget/form/settings/identityform.h" #include "form/settings/identityform.h"
#include "widget/form/filesform.h" #include "form/filesform.h"
#include "corestructs.h" #include "src/corestructs.h"
#define PIXELS_TO_ACT 7 #define PIXELS_TO_ACT 7