revert: "refactor: Added to include path and exclude it from all includes"

Revert needed, since otherwise there is no way to do automatic sorting
of includes.
Also reverted change to the docs, as leaving it would make incorrect
docs.

In case of conflicts, includes were sorted according to the coding
standards from #3839.

This reverts commit b4a9f04f92.
This reverts commit 5921122960.
pull/3986/head
Zetok Zalbavar 2016-12-19 02:26:26 +00:00
parent 4972ac1d53
commit d4ac13dbf4
No known key found for this signature in database
GPG Key ID: C953D3880212068A
119 changed files with 479 additions and 480 deletions

View File

@ -353,15 +353,15 @@ Use `C++11`.
## Includes
On the project level, include files starting with the module name, e.g.
`core/core.h` from `widget/widget.cpp`:
On the project level, include files starting with the root directory of the
repository, e.g. `src/core/core.h` from `src/widget/widget.cpp`:
```C++
#include "core/core.h"
#include "src/core/core.h"
```
Do **not** use `<>` tags to include files on the project level, e.g.
`core/core.h` from `widget/widget.cpp`:
`src/core/core.h` from `src/widget/widget.cpp`:
```C++
#include <core.h> // WRONG

View File

@ -21,7 +21,6 @@ QT += core gui network xml opengl sql svg widgets
TARGET = qtox
TEMPLATE = app
INCLUDEPATH += src
FORMS += \
src/loginscreen.ui \
src/mainwindow.ui \

View File

@ -18,9 +18,9 @@
*/
#include "audio.h"
#include "core/core.h"
#include "core/coreav.h"
#include "persistence/settings.h"
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/persistence/settings.h"
#include <QDebug>
#include <QFile>

View File

@ -18,7 +18,7 @@
*/
#include "chatlinecontentproxy.h"
#include "chatlog/content/filetransferwidget.h"
#include "src/chatlog/content/filetransferwidget.h"
#include <QLayout>
#include <QWidget>
#include <QPainter>

View File

@ -22,7 +22,7 @@
#include "chatlinecontent.h"
#include "chatlinecontentproxy.h"
#include "content/filetransferwidget.h"
#include "widget/translator.h"
#include "src/widget/translator.h"
#include <QDebug>
#include <QScrollBar>

View File

@ -28,8 +28,8 @@
#include <QDebug>
#include "persistence/settings.h"
#include "persistence/smileypack.h"
#include "src/persistence/settings.h"
#include "src/persistence/smileypack.h"
#define NAME_COL_WIDTH 90.0
#define TIME_COL_WIDTH 90.0

View File

@ -21,7 +21,7 @@
#define CHATMESSAGE_H
#include "chatline.h"
#include "core/corestructs.h"
#include "src/core/corestructs.h"
#include <QDateTime>
class QGraphicsScene;

View File

@ -20,12 +20,12 @@
#include "filetransferwidget.h"
#include "ui_filetransferwidget.h"
#include "nexus.h"
#include "core/core.h"
#include "widget/gui.h"
#include "widget/style.h"
#include "widget/widget.h"
#include "persistence/settings.h"
#include "src/nexus.h"
#include "src/core/core.h"
#include "src/widget/gui.h"
#include "src/widget/style.h"
#include "src/widget/widget.h"
#include "src/persistence/settings.h"
#include <QMouseEvent>
#include <QFileDialog>

View File

@ -23,8 +23,8 @@
#include <QWidget>
#include <QTime>
#include "chatlog/chatlinecontent.h"
#include "core/corestructs.h"
#include "src/chatlog/chatlinecontent.h"
#include "src/core/corestructs.h"
namespace Ui {

View File

@ -31,7 +31,7 @@
#include <QDesktopServices>
#include <QTextFragment>
#include "widget/style.h"
#include "src/widget/style.h"
Text::Text(const QString& txt, const QFont& font, bool enableElide, const QString &rwText, const QColor c)
: rawText(rwText)

View File

@ -18,9 +18,9 @@
*/
#include "customtextdocument.h"
#include "persistence/settings.h"
#include "persistence/smileypack.h"
#include "widget/style.h"
#include "src/persistence/settings.h"
#include "src/persistence/smileypack.h"
#include "src/widget/style.h"
#include <QIcon>
#include <QDebug>

View File

@ -19,16 +19,16 @@
*/
#include "core.h"
#include "nexus.h"
#include "core/cstring.h"
#include "core/coreav.h"
#include "persistence/settings.h"
#include "widget/gui.h"
#include "persistence/profilelocker.h"
#include "net/avatarbroadcaster.h"
#include "persistence/profile.h"
#include "src/nexus.h"
#include "src/core/cstring.h"
#include "src/core/coreav.h"
#include "src/persistence/settings.h"
#include "src/widget/gui.h"
#include "src/persistence/profilelocker.h"
#include "src/net/avatarbroadcaster.h"
#include "src/persistence/profile.h"
#include "corefile.h"
#include "video/camerasource.h"
#include "src/video/camerasource.h"
#include <tox/tox.h>
#include <tox/toxav.h>

View File

@ -20,12 +20,12 @@
#include "core.h"
#include "coreav.h"
#include "audio/audio.h"
#include "friend.h"
#include "group.h"
#include "persistence/settings.h"
#include "video/videoframe.h"
#include "video/corevideosource.h"
#include "src/audio/audio.h"
#include "src/friend.h"
#include "src/group.h"
#include "src/persistence/settings.h"
#include "src/video/videoframe.h"
#include "src/video/corevideosource.h"
#include <cassert>
#include <QThread>
#include <QTimer>

View File

@ -24,7 +24,7 @@
#include <QObject>
#include <memory>
#include <atomic>
#include "core/toxcall.h"
#include "src/core/toxcall.h"
#include <tox/toxav.h>
class Friend;

View File

@ -22,12 +22,12 @@
/* was permanently moved here to handle encryption */
#include "core.h"
#include "widget/gui.h"
#include "persistence/settings.h"
#include "core/cstring.h"
#include "nexus.h"
#include "persistence/profile.h"
#include "persistence/historykeeper.h"
#include "src/widget/gui.h"
#include "src/persistence/settings.h"
#include "src/core/cstring.h"
#include "src/nexus.h"
#include "src/persistence/profile.h"
#include "src/persistence/historykeeper.h"
#include <tox/tox.h>
#include <tox/toxencryptsave.h>
#include <QApplication>

View File

@ -21,9 +21,9 @@
#include "core.h"
#include "corefile.h"
#include "corestructs.h"
#include "core/cstring.h"
#include "persistence/settings.h"
#include "persistence/profile.h"
#include "src/core/cstring.h"
#include "src/persistence/settings.h"
#include "src/persistence/profile.h"
#include <QDebug>
#include <QFile>
#include <QThread>

View File

@ -1,5 +1,5 @@
#include "core/corestructs.h"
#include "core/core.h"
#include "src/core/corestructs.h"
#include "src/core/core.h"
#include <tox/tox.h>
#include <QFile>
#include <QRegularExpression>

View File

@ -1,9 +1,9 @@
#include "audio/audio.h"
#include "core/toxcall.h"
#include "core/coreav.h"
#include "persistence/settings.h"
#include "video/camerasource.h"
#include "video/corevideosource.h"
#include "src/audio/audio.h"
#include "src/core/toxcall.h"
#include "src/core/coreav.h"
#include "src/persistence/settings.h"
#include "src/video/camerasource.h"
#include "src/video/corevideosource.h"
#include <QTimer>
#include <QtConcurrent/QtConcurrent>

View File

@ -5,7 +5,7 @@
#include <QtGlobal>
#include <QMetaObject>
#include "core/indexedlist.h"
#include "src/core/indexedlist.h"
#include <tox/toxav.h>

View File

@ -23,12 +23,12 @@
#include "widget/friendwidget.h"
#include "widget/form/chatform.h"
#include "widget/gui.h"
#include "core/core.h"
#include "persistence/settings.h"
#include "persistence/profile.h"
#include "nexus.h"
#include "grouplist.h"
#include "group.h"
#include "src/core/core.h"
#include "src/persistence/settings.h"
#include "src/persistence/profile.h"
#include "src/nexus.h"
#include "src/grouplist.h"
#include "src/group.h"
Friend::Friend(uint32_t FriendId, const ToxId &UserId)
: userName{Core::getInstance()->getPeerName(UserId)}

View File

@ -22,7 +22,7 @@
#include <QObject>
#include <QString>
#include "core/corestructs.h"
#include "src/core/corestructs.h"
#include "core/toxid.h"
class FriendWidget;

View File

@ -19,7 +19,7 @@
#include "friend.h"
#include "friendlist.h"
#include "persistence/settings.h"
#include "src/persistence/settings.h"
#include <QMenu>
#include <QDebug>
#include <QHash>

View File

@ -22,7 +22,7 @@
#include "widget/form/groupchatform.h"
#include "friendlist.h"
#include "friend.h"
#include "core/core.h"
#include "src/core/core.h"
#include "widget/gui.h"
#include <QDebug>
#include <QTimer>

View File

@ -17,8 +17,8 @@
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ipc.h"
#include "persistence/settings.h"
#include "src/ipc.h"
#include "src/persistence/settings.h"
#include <QCoreApplication>
#include <QDebug>
#include <QThread>

View File

@ -19,15 +19,15 @@
#include "widget/widget.h"
#include "persistence/settings.h"
#include "nexus.h"
#include "ipc.h"
#include "net/toxuri.h"
#include "net/autoupdate.h"
#include "persistence/toxsave.h"
#include "persistence/profile.h"
#include "widget/loginscreen.h"
#include "widget/translator.h"
#include "video/camerasource.h"
#include "src/nexus.h"
#include "src/ipc.h"
#include "src/net/toxuri.h"
#include "src/net/autoupdate.h"
#include "src/persistence/toxsave.h"
#include "src/persistence/profile.h"
#include "src/widget/loginscreen.h"
#include "src/widget/translator.h"
#include "src/video/camerasource.h"
#include <QApplication>
#include <QCommandLineParser>
#include <QDateTime>

View File

@ -17,12 +17,12 @@
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#include "net/autoupdate.h"
#include "persistence/serialize.h"
#include "persistence/settings.h"
#include "widget/widget.h"
#include "widget/gui.h"
#include "nexus.h"
#include "src/net/autoupdate.h"
#include "src/persistence/serialize.h"
#include "src/persistence/settings.h"
#include "src/widget/widget.h"
#include "src/widget/gui.h"
#include "src/nexus.h"
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QCoreApplication>

View File

@ -19,7 +19,7 @@
#include "avatarbroadcaster.h"
#include "core/core.h"
#include "src/core/core.h"
#include <QObject>
#include <QDebug>

View File

@ -18,7 +18,7 @@
*/
#include "toxme.h"
#include "core/core.h"
#include "src/core/core.h"
#include <src/persistence/settings.h>
#include <QtDebug>
#include <QNetworkAccessManager>

View File

@ -26,7 +26,7 @@
#include <QMutex>
#include <QNetworkReply>
#include <memory>
#include "core/toxid.h"
#include "src/core/toxid.h"
class QNetworkAccessManager;

View File

@ -18,11 +18,11 @@
*/
#include "net/toxuri.h"
#include "net/toxme.h"
#include "widget/tool/friendrequestdialog.h"
#include "nexus.h"
#include "core/core.h"
#include "src/net/toxuri.h"
#include "src/net/toxme.h"
#include "src/widget/tool/friendrequestdialog.h"
#include "src/nexus.h"
#include "src/core/core.h"
#include <QByteArray>
#include <QString>
#include <QMessageBox>

View File

@ -19,10 +19,10 @@
#include "nexus.h"
#include "persistence/profile.h"
#include "core/core.h"
#include "core/coreav.h"
#include "widget/widget.h"
#include "src/persistence/profile.h"
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/widget/widget.h"
#include "persistence/settings.h"
#include "video/camerasource.h"
#include "widget/gui.h"

View File

@ -18,10 +18,10 @@
*/
#include "encrypteddb.h"
#include "persistence/settings.h"
#include "core/core.h"
#include "nexus.h"
#include "persistence/profile.h"
#include "src/persistence/settings.h"
#include "src/core/core.h"
#include "src/nexus.h"
#include "src/persistence/profile.h"
#include <tox/toxencryptsave.h>

View File

@ -27,7 +27,7 @@
#include <cstdint>
#include <tox/toxencryptsave.h>
#include "persistence/db/rawdatabase.h"
#include "src/persistence/db/rawdatabase.h"
class Profile;
class HistoryKeeper;

View File

@ -18,10 +18,10 @@
*/
#include "historykeeper.h"
#include "persistence/settings.h"
#include "core/core.h"
#include "nexus.h"
#include "persistence/profile.h"
#include "src/persistence/settings.h"
#include "src/core/core.h"
#include "src/nexus.h"
#include "src/persistence/profile.h"
#include <QSqlError>
#include <QFile>
@ -32,8 +32,8 @@
#include <QDebug>
#include <QTemporaryFile>
#include "persistence/db/plaindb.h"
#include "persistence/db/encrypteddb.h"
#include "src/persistence/db/plaindb.h"
#include "src/persistence/db/encrypteddb.h"
/**
* @class HistoryKeeper

View File

@ -18,11 +18,11 @@
*/
#include "offlinemsgengine.h"
#include "friend.h"
#include "persistence/settings.h"
#include "core/core.h"
#include "nexus.h"
#include "persistence/profile.h"
#include "src/friend.h"
#include "src/persistence/settings.h"
#include "src/core/core.h"
#include "src/nexus.h"
#include "src/persistence/profile.h"
#include <QMutexLocker>
#include <QTimer>

View File

@ -25,7 +25,7 @@
#include <QMutex>
#include <QDateTime>
#include <QMap>
#include "chatlog/chatmessage.h"
#include "src/chatlog/chatmessage.h"
class Friend;
class QTimer;

View File

@ -32,10 +32,10 @@
#include "profilelocker.h"
#include "settings.h"
#include "historykeeper.h"
#include "core/core.h"
#include "nexus.h"
#include "widget/gui.h"
#include "widget/widget.h"
#include "src/core/core.h"
#include "src/nexus.h"
#include "src/widget/gui.h"
#include "src/widget/widget.h"
/**
* @class Profile

View File

@ -28,7 +28,7 @@
#include <QObject>
#include <tox/toxencryptsave.h>
#include <memory>
#include "persistence/history.h"
#include "src/persistence/history.h"
class Core;
class QThread;

View File

@ -19,7 +19,7 @@
#include "profilelocker.h"
#include "persistence/settings.h"
#include "src/persistence/settings.h"
#include <QDir>
#include <QDebug>

View File

@ -17,7 +17,7 @@
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#include "persistence/serialize.h"
#include "src/persistence/serialize.h"
/**
* @file serialize.cpp

View File

@ -19,20 +19,20 @@
*/
#include "settings.h"
#include "persistence/smileypack.h"
#include "persistence/db/plaindb.h"
#include "core/corestructs.h"
#include "core/core.h"
#include "widget/gui.h"
#include "widget/style.h"
#include "persistence/profilelocker.h"
#include "persistence/settingsserializer.h"
#include "nexus.h"
#include "persistence/profile.h"
#include "src/persistence/smileypack.h"
#include "src/persistence/db/plaindb.h"
#include "src/core/corestructs.h"
#include "src/core/core.h"
#include "src/widget/gui.h"
#include "src/widget/style.h"
#include "src/persistence/profilelocker.h"
#include "src/persistence/settingsserializer.h"
#include "src/nexus.h"
#include "src/persistence/profile.h"
#ifdef QTOX_PLATFORM_EXT
#include "platform/autorun.h"
#include "src/platform/autorun.h"
#endif
#include "ipc.h"
#include "src/ipc.h"
#include <QFont>
#include <QApplication>

View File

@ -29,7 +29,7 @@
#include <QDate>
#include <QNetworkProxy>
#include <QFlags>
#include "core/corestructs.h"
#include "src/core/corestructs.h"
class ToxId;
class Profile;

View File

@ -19,9 +19,9 @@
#include "settingsserializer.h"
#include "serialize.h"
#include "nexus.h"
#include "persistence/profile.h"
#include "core/core.h"
#include "src/nexus.h"
#include "src/persistence/profile.h"
#include "src/core/core.h"
#include <QSaveFile>
#include <QFile>
#include <QDebug>

View File

@ -18,8 +18,8 @@
*/
#include "smileypack.h"
#include "persistence/settings.h"
#include "widget/style.h"
#include "src/persistence/settings.h"
#include "src/widget/style.h"
#include <QBuffer>
#include <QCoreApplication>

View File

@ -18,10 +18,10 @@
*/
#include "toxsave.h"
#include "widget/gui.h"
#include "core/core.h"
#include "persistence/settings.h"
#include "widget/tool/profileimporter.h"
#include "src/widget/gui.h"
#include "src/core/core.h"
#include "src/persistence/settings.h"
#include "src/widget/tool/profileimporter.h"
#include <QCoreApplication>
#include <QFileInfo>

View File

@ -18,7 +18,7 @@
*/
#if defined(__APPLE__) && defined(__MACH__)
#include "platform/autorun.h"
#include "src/platform/autorun.h"
#include <QSettings>
#include <QDir>
#include <QFile>

View File

@ -19,8 +19,8 @@
#include <QApplication>
#ifdef Q_OS_WIN32
#include "platform/autorun.h"
#include "persistence/settings.h"
#include "src/platform/autorun.h"
#include "src/persistence/settings.h"
#include <windows.h>
#include <string>

View File

@ -19,8 +19,8 @@
#include <QApplication>
#if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
#include "platform/autorun.h"
#include "persistence/settings.h"
#include "src/platform/autorun.h"
#include "src/persistence/settings.h"
#include <QProcessEnvironment>
#include <QDir>

View File

@ -22,7 +22,7 @@
#include <QString>
#include <QVector>
#include <QPair>
#include "video/videomode.h"
#include "src/video/videomode.h"
#ifndef Q_OS_MACX
#error "This file is only meant to be compiled for Mac OS X targets"

View File

@ -24,7 +24,7 @@
#include <QString>
#include <QVector>
#include <QPair>
#include "video/videomode.h"
#include "src/video/videomode.h"
#ifndef Q_OS_WIN
#error "This file is only meant to be compiled for Windows targets"

View File

@ -22,7 +22,7 @@
#include <QString>
#include <QVector>
#include <QPair>
#include "video/videomode.h"
#include "src/video/videomode.h"
#if !(defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD))
#error "This file is only meant to be compiled for Linux or FreeBSD targets"

View File

@ -19,7 +19,7 @@
#include <QtCore/qsystemdetection.h>
#if defined(__APPLE__) && defined(__MACH__)
#include "platform/capslock.h"
#include "src/platform/capslock.h"
// TODO: Implement for osx
bool Platform::capsLockEnabled()

View File

@ -20,7 +20,7 @@
#include <QtCore/qsystemdetection.h>
#ifdef Q_OS_WIN32
#include <windows.h>
#include "platform/capslock.h"
#include "src/platform/capslock.h"
bool Platform::capsLockEnabled()
{

View File

@ -20,7 +20,7 @@
#include <QtCore/qsystemdetection.h>
#if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
#include <X11/XKBlib.h>
#include "platform/capslock.h"
#include "src/platform/capslock.h"
#undef KeyPress
#undef KeyRelease
#undef FocusIn

View File

@ -25,7 +25,7 @@
#include <QtCore/qsystemdetection.h>
#if defined(__APPLE__) && defined(__MACH__)
#include "platform/timer.h"
#include "src/platform/timer.h"
#include <IOKit/IOKitLib.h>
#include <CoreFoundation/CoreFoundation.h>

View File

@ -19,7 +19,7 @@
#include <QtCore/qsystemdetection.h>
#ifdef Q_OS_WIN32
#include "platform/timer.h"
#include "src/platform/timer.h"
#include <windows.h>
uint32_t Platform::getIdleTime()

View File

@ -18,7 +18,7 @@
#include <QtCore/qsystemdetection.h>
#if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
#include <QDebug>
#include "platform/timer.h"
#include "src/platform/timer.h"
#include <X11/extensions/scrnsaver.h>
uint32_t Platform::getIdleTime()

View File

@ -26,16 +26,16 @@ extern "C" {
#include <libavdevice/avdevice.h>
}
#include "cameradevice.h"
#include "persistence/settings.h"
#include "src/persistence/settings.h"
#ifdef Q_OS_WIN
#include "platform/camera/directshow.h"
#include "src/platform/camera/directshow.h"
#endif
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#include "platform/camera/v4l2.h"
#include "src/platform/camera/v4l2.h"
#endif
#ifdef Q_OS_OSX
#include "platform/camera/avfoundation.h"
#include "src/platform/camera/avfoundation.h"
#endif
/**

View File

@ -29,7 +29,7 @@ extern "C" {
#include <QtConcurrent/QtConcurrentRun>
#include <memory>
#include <functional>
#include "persistence/settings.h"
#include "src/persistence/settings.h"
#include "camerasource.h"
#include "cameradevice.h"
#include "videoframe.h"

View File

@ -26,8 +26,8 @@
#include <QVector>
#include <QReadWriteLock>
#include <atomic>
#include "video/videosource.h"
#include "video/videomode.h"
#include "src/video/videosource.h"
#include "src/video/videomode.h"
class CameraDevice;
struct AVCodecContext;

View File

@ -24,7 +24,7 @@
#include <QVBoxLayout>
#include <QWidget>
#include "video/videosurface.h"
#include "src/video/videosurface.h"
class GenericNetCamView : public QWidget
{

View File

@ -18,14 +18,14 @@
*/
#include "groupnetcamview.h"
#include "widget/tool/croppinglabel.h"
#include "video/videosurface.h"
#include "persistence/profile.h"
#include "audio/audio.h"
#include "core/core.h"
#include "nexus.h"
#include "friendlist.h"
#include "friend.h"
#include "src/widget/tool/croppinglabel.h"
#include "src/video/videosurface.h"
#include "src/persistence/profile.h"
#include "src/audio/audio.h"
#include "src/core/core.h"
#include "src/nexus.h"
#include "src/friendlist.h"
#include "src/friend.h"
#include <QBoxLayout>
#include <QScrollArea>
#include <QSplitter>

View File

@ -19,14 +19,14 @@
#include "netcamview.h"
#include "camerasource.h"
#include "friend.h"
#include "friendlist.h"
#include "core/core.h"
#include "video/videosurface.h"
#include "widget/tool/movablewidget.h"
#include "persistence/settings.h"
#include "persistence/profile.h"
#include "nexus.h"
#include "src/friend.h"
#include "src/friendlist.h"
#include "src/core/core.h"
#include "src/video/videosurface.h"
#include "src/widget/tool/movablewidget.h"
#include "src/persistence/settings.h"
#include "src/persistence/profile.h"
#include "src/nexus.h"
#include <QLabel>
#include <QBoxLayout>
#include <QFrame>

View File

@ -18,13 +18,13 @@
*/
#include "videosurface.h"
#include "video/videoframe.h"
#include "friend.h"
#include "friendlist.h"
#include "widget/friendwidget.h"
#include "persistence/settings.h"
#include "core/core.h"
#include "widget/style.h"
#include "src/video/videoframe.h"
#include "src/friend.h"
#include "src/friendlist.h"
#include "src/widget/friendwidget.h"
#include "src/persistence/settings.h"
#include "src/core/core.h"
#include "src/widget/style.h"
#include <QPainter>
#include <QLabel>

View File

@ -23,7 +23,7 @@
#include <QWidget>
#include <memory>
#include <atomic>
#include "video/videosource.h"
#include "src/video/videosource.h"
class VideoSurface : public QWidget
{

View File

@ -1,8 +1,8 @@
#include "aboutuser.h"
#include "ui_aboutuser.h"
#include "persistence/settings.h"
#include "persistence/profile.h"
#include "nexus.h"
#include "src/persistence/settings.h"
#include "src/persistence/profile.h"
#include "src/nexus.h"
#include <QDir>
#include <QFileDialog>

View File

@ -2,7 +2,7 @@
#define ABOUTUSER_H
#include <QDialog>
#include "friend.h"
#include "src/friend.h"
namespace Ui {

View File

@ -21,7 +21,7 @@
#include "friendlistlayout.h"
#include "friendlistwidget.h"
#include "friendwidget.h"
#include "widget/style.h"
#include "src/widget/style.h"
#include "tool/croppinglabel.h"
#include <QBoxLayout>
#include <QMouseEvent>

View File

@ -21,7 +21,7 @@
#define CATEGORYWIDGET_H
#include "genericchatitemwidget.h"
#include "core/corestructs.h"
#include "src/core/corestructs.h"
class FriendListLayout;
class FriendListWidget;

View File

@ -33,9 +33,9 @@
#include "tool/croppinglabel.h"
#include "widget.h"
#include "friend.h"
#include "friendlist.h"
#include "persistence/settings.h"
#include "src/friend.h"
#include "src/friendlist.h"
#include "src/persistence/settings.h"
QHash<int, CircleWidget*> CircleWidget::circleList;

View File

@ -32,16 +32,16 @@
#include "style.h"
#include "widget.h"
#include "tool/adjustingscrollarea.h"
#include "persistence/settings.h"
#include "friend.h"
#include "friendlist.h"
#include "group.h"
#include "grouplist.h"
#include "widget/form/chatform.h"
#include "core/core.h"
#include "widget/friendlistlayout.h"
#include "widget/form/settingswidget.h"
#include "widget/translator.h"
#include "src/persistence/settings.h"
#include "src/friend.h"
#include "src/friendlist.h"
#include "src/group.h"
#include "src/grouplist.h"
#include "src/widget/form/chatform.h"
#include "src/core/core.h"
#include "src/widget/friendlistlayout.h"
#include "src/widget/form/settingswidget.h"
#include "src/widget/translator.h"
ContentDialog* ContentDialog::currentDialog = nullptr;
QHash<int, std::tuple<ContentDialog*, GenericChatroomWidget*>> ContentDialog::friendList;

View File

@ -22,9 +22,9 @@
#include <tuple>
#include "core/corestructs.h"
#include "widget/genericchatitemlayout.h"
#include "widget/tool/activatedialog.h"
#include "src/core/corestructs.h"
#include "src/widget/genericchatitemlayout.h"
#include "src/widget/tool/activatedialog.h"
template <typename K, typename V> class QHash;
template <typename T> class QSet;

View File

@ -18,7 +18,7 @@
*/
#include "contentlayout.h"
#include "persistence/settings.h"
#include "src/persistence/settings.h"
#include "style.h"
#include <QStyleFactory>
#include <QFrame>

View File

@ -18,9 +18,9 @@
*/
#include "emoticonswidget.h"
#include "widget/style.h"
#include "persistence/smileypack.h"
#include "persistence/settings.h"
#include "src/widget/style.h"
#include "src/persistence/smileypack.h"
#include "src/persistence/settings.h"
#include <QPushButton>
#include <QRadioButton>

View File

@ -27,15 +27,15 @@
#include <QTabWidget>
#include <QSignalMapper>
#include <tox/tox.h>
#include "nexus.h"
#include "core/core.h"
#include "net/toxme.h"
#include "persistence/settings.h"
#include "widget/gui.h"
#include "widget/translator.h"
#include "widget/contentlayout.h"
#include "widget/tool/croppinglabel.h"
#include "net/toxme.h"
#include "src/nexus.h"
#include "src/core/core.h"
#include "src/net/toxme.h"
#include "src/persistence/settings.h"
#include "src/widget/gui.h"
#include "src/widget/translator.h"
#include "src/widget/contentlayout.h"
#include "src/widget/tool/croppinglabel.h"
#include "src/net/toxme.h"
#include <QWindow>
#include <QScrollArea>

View File

@ -19,6 +19,35 @@
#include "chatform.h"
#include "src/audio/audio.h"
#include "src/chatlog/chatlinecontentproxy.h"
#include "src/chatlog/chatlog.h"
#include "src/chatlog/chatmessage.h"
#include "src/chatlog/content/filetransferwidget.h"
#include "src/chatlog/content/text.h"
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/core/cstring.h"
#include "src/friend.h"
#include "src/nexus.h"
#include "src/persistence/offlinemsgengine.h"
#include "src/persistence/profile.h"
#include "src/persistence/settings.h"
#include "src/video/camerasource.h"
#include "src/video/netcamview.h"
#include "src/video/videosource.h"
#include "src/widget/form/loadhistorydialog.h"
#include "src/widget/friendwidget.h"
#include "src/widget/maskablepixmapwidget.h"
#include "src/widget/style.h"
#include "src/widget/tool/callconfirmwidget.h"
#include "src/widget/tool/chattextedit.h"
#include "src/widget/tool/croppinglabel.h"
#include "src/widget/tool/flyoutoverlaywidget.h"
#include "src/widget/tool/screenshotgrabber.h"
#include "src/widget/translator.h"
#include "src/widget/widget.h"
#include <QApplication>
#include <QBitmap>
#include <QBoxLayout>
@ -37,37 +66,7 @@
#include <QTemporaryFile>
#include <cassert>
#include "chatform.h"
#include "audio/audio.h"
#include "chatlog/chatlinecontentproxy.h"
#include "chatlog/chatlog.h"
#include "chatlog/chatmessage.h"
#include "chatlog/content/filetransferwidget.h"
#include "chatlog/content/text.h"
#include "core/core.h"
#include "core/coreav.h"
#include "core/cstring.h"
#include "friend.h"
#include "nexus.h"
#include "nexus.h"
#include "persistence/offlinemsgengine.h"
#include "persistence/profile.h"
#include "persistence/settings.h"
#include "video/camerasource.h"
#include "video/netcamview.h"
#include "video/videosource.h"
#include "widget/form/loadhistorydialog.h"
#include "widget/friendwidget.h"
#include "widget/maskablepixmapwidget.h"
#include "widget/style.h"
#include "widget/tool/callconfirmwidget.h"
#include "widget/tool/chattextedit.h"
#include "widget/tool/croppinglabel.h"
#include "widget/tool/flyoutoverlaywidget.h"
#include "widget/tool/screenshotgrabber.h"
#include "widget/translator.h"
#include "widget/widget.h"
const QString ChatForm::ACTION_PREFIX = QStringLiteral("/me ");

View File

@ -26,8 +26,8 @@
#include <QElapsedTimer>
#include "genericchatform.h"
#include "core/corestructs.h"
#include "widget/tool/screenshotgrabber.h"
#include "src/core/corestructs.h"
#include "src/widget/tool/screenshotgrabber.h"
class Friend;
class FileTransferInstance;

View File

@ -18,9 +18,9 @@
*/
#include "filesform.h"
#include "widget/widget.h"
#include "widget/translator.h"
#include "widget/contentlayout.h"
#include "src/widget/widget.h"
#include "src/widget/translator.h"
#include "src/widget/contentlayout.h"
#include <QFileInfo>
#include <QWindow>

View File

@ -28,26 +28,26 @@
#include <QSplitter>
#include <QClipboard>
#include "chatlog/chatlog.h"
#include "chatlog/content/timestamp.h"
#include "core/core.h"
#include "friend.h"
#include "friendlist.h"
#include "group.h"
#include "grouplist.h"
#include "persistence/settings.h"
#include "persistence/smileypack.h"
#include "video/genericnetcamview.h"
#include "widget/contentdialog.h"
#include "widget/contentlayout.h"
#include "widget/emoticonswidget.h"
#include "widget/maskablepixmapwidget.h"
#include "widget/style.h"
#include "widget/tool/chattextedit.h"
#include "widget/tool/croppinglabel.h"
#include "widget/tool/flyoutoverlaywidget.h"
#include "widget/translator.h"
#include "widget/widget.h"
#include "src/chatlog/chatlog.h"
#include "src/chatlog/content/timestamp.h"
#include "src/core/core.h"
#include "src/friend.h"
#include "src/friendlist.h"
#include "src/group.h"
#include "src/grouplist.h"
#include "src/persistence/settings.h"
#include "src/persistence/smileypack.h"
#include "src/video/genericnetcamview.h"
#include "src/widget/contentdialog.h"
#include "src/widget/contentlayout.h"
#include "src/widget/emoticonswidget.h"
#include "src/widget/maskablepixmapwidget.h"
#include "src/widget/style.h"
#include "src/widget/tool/chattextedit.h"
#include "src/widget/tool/croppinglabel.h"
#include "src/widget/tool/flyoutoverlaywidget.h"
#include "src/widget/translator.h"
#include "src/widget/widget.h"
GenericChatForm::GenericChatForm(QWidget *parent)
: QWidget(parent, Qt::Window)

View File

@ -24,9 +24,9 @@
#include <QPoint>
#include <QDateTime>
#include <QMenu>
#include "core/corestructs.h"
#include "chatlog/chatmessage.h"
#include "core/toxid.h"
#include "src/core/corestructs.h"
#include "src/chatlog/chatmessage.h"
#include "src/core/toxid.h"
/**
* Spacing in px inserted when the author of the last message changes

View File

@ -24,19 +24,19 @@
#include <QTimer>
#include "tabcompleter.h"
#include "group.h"
#include "friend.h"
#include "friendlist.h"
#include "widget/groupwidget.h"
#include "widget/tool/croppinglabel.h"
#include "widget/maskablepixmapwidget.h"
#include "core/core.h"
#include "core/coreav.h"
#include "widget/style.h"
#include "widget/flowlayout.h"
#include "widget/translator.h"
#include "widget/form/chatform.h"
#include "video/groupnetcamview.h"
#include "src/group.h"
#include "src/friend.h"
#include "src/friendlist.h"
#include "src/widget/groupwidget.h"
#include "src/widget/tool/croppinglabel.h"
#include "src/widget/maskablepixmapwidget.h"
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/widget/style.h"
#include "src/widget/flowlayout.h"
#include "src/widget/translator.h"
#include "src/widget/form/chatform.h"
#include "src/video/groupnetcamview.h"
/**
* @var QList<QLabel*> GroupChatForm::peerLabels

View File

@ -29,14 +29,14 @@
#include <QLabel>
#include <QWindow>
#include "ui_mainwindow.h"
#include "persistence/settings.h"
#include "widget/tool/croppinglabel.h"
#include "widget/translator.h"
#include "nexus.h"
#include "core/core.h"
#include "widget/gui.h"
#include "widget/translator.h"
#include "widget/contentlayout.h"
#include "src/persistence/settings.h"
#include "src/widget/tool/croppinglabel.h"
#include "src/widget/translator.h"
#include "src/nexus.h"
#include "src/core/core.h"
#include "src/widget/gui.h"
#include "src/widget/translator.h"
#include "src/widget/contentlayout.h"
GroupInviteForm::GroupInviteForm()
{

View File

@ -23,8 +23,8 @@
#include <QWidget>
#include <QDateTime>
#include <QSet>
#include "widget/tool/croppinglabel.h"
#include "widget/gui.h"
#include "src/widget/tool/croppinglabel.h"
#include "src/widget/gui.h"
#include <QScrollArea>
class QLabel;

View File

@ -17,23 +17,23 @@
along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/
#include "core/core.h"
#include "nexus.h"
#include "src/core/core.h"
#include "src/nexus.h"
#include "ui_profileform.h"
#include "profileform.h"
#include "widget/form/settingswidget.h"
#include "widget/maskablepixmapwidget.h"
#include "widget/form/setpassworddialog.h"
#include "widget/contentlayout.h"
#include "widget/tool/croppinglabel.h"
#include "widget/widget.h"
#include "widget/gui.h"
#include "widget/style.h"
#include "widget/translator.h"
#include "persistence/profilelocker.h"
#include "persistence/profile.h"
#include "persistence/settings.h"
#include "net/toxme.h"
#include "src/widget/form/settingswidget.h"
#include "src/widget/maskablepixmapwidget.h"
#include "src/widget/form/setpassworddialog.h"
#include "src/widget/contentlayout.h"
#include "src/widget/tool/croppinglabel.h"
#include "src/widget/widget.h"
#include "src/widget/gui.h"
#include "src/widget/style.h"
#include "src/widget/translator.h"
#include "src/persistence/profilelocker.h"
#include "src/persistence/profile.h"
#include "src/persistence/settings.h"
#include "src/net/toxme.h"
#include <QLabel>
#include <QLineEdit>
#include <QGroupBox>

View File

@ -24,8 +24,8 @@
#include <QLabel>
#include <QTimer>
#include <QVBoxLayout>
#include "core/core.h"
#include "widget/qrwidget.h"
#include "src/core/core.h"
#include "src/widget/qrwidget.h"
class CroppingLabel;
class Core;

View File

@ -24,9 +24,9 @@
#include <QDebug>
#include <tox/tox.h>
#include "core/recursivesignalblocker.h"
#include "net/autoupdate.h"
#include "widget/translator.h"
#include "src/core/recursivesignalblocker.h"
#include "src/net/autoupdate.h"
#include "src/widget/translator.h"
/**
* @class AboutForm

View File

@ -27,15 +27,15 @@
#include <QClipboard>
#include <QFileDialog>
#include "core/core.h"
#include "core/coreav.h"
#include "core/recursivesignalblocker.h"
#include "nexus.h"
#include "persistence/settings.h"
#include "persistence/db/plaindb.h"
#include "persistence/profile.h"
#include "widget/gui.h"
#include "widget/translator.h"
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/core/recursivesignalblocker.h"
#include "src/nexus.h"
#include "src/persistence/settings.h"
#include "src/persistence/db/plaindb.h"
#include "src/persistence/profile.h"
#include "src/widget/gui.h"
#include "src/widget/translator.h"
/**
* @class AdvancedForm

View File

@ -27,16 +27,16 @@
#include <QScreen>
#include <QShowEvent>
#include "audio/audio.h"
#include "core/core.h"
#include "core/coreav.h"
#include "core/recursivesignalblocker.h"
#include "persistence/settings.h"
#include "video/cameradevice.h"
#include "video/camerasource.h"
#include "video/videosurface.h"
#include "widget/tool/screenshotgrabber.h"
#include "widget/translator.h"
#include "src/audio/audio.h"
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/core/recursivesignalblocker.h"
#include "src/persistence/settings.h"
#include "src/video/cameradevice.h"
#include "src/video/camerasource.h"
#include "src/video/videosurface.h"
#include "src/widget/tool/screenshotgrabber.h"
#include "src/widget/translator.h"
#ifndef ALC_ALL_DEVICES_SPECIFIER
#define ALC_ALL_DEVICES_SPECIFIER ALC_DEVICE_SPECIFIER

View File

@ -26,7 +26,7 @@
#include "genericsettings.h"
#include "ui_avform.h"
#include "video/videomode.h"
#include "src/video/videomode.h"
class CameraSource;

View File

@ -22,18 +22,18 @@
#include <QFileDialog>
#include "core/core.h"
#include "core/coreav.h"
#include "core/recursivesignalblocker.h"
#include "net/autoupdate.h"
#include "nexus.h"
#include "persistence/profile.h"
#include "persistence/settings.h"
#include "persistence/smileypack.h"
#include "widget/form/settingswidget.h"
#include "widget/style.h"
#include "widget/translator.h"
#include "widget/widget.h"
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/core/recursivesignalblocker.h"
#include "src/net/autoupdate.h"
#include "src/nexus.h"
#include "src/persistence/profile.h"
#include "src/persistence/settings.h"
#include "src/persistence/smileypack.h"
#include "src/widget/form/settingswidget.h"
#include "src/widget/style.h"
#include "src/widget/translator.h"
#include "src/widget/widget.h"
static QStringList locales = {"ar",
"be",

View File

@ -24,17 +24,17 @@
#include <QFile>
#include <QMessageBox>
#include "core/core.h"
#include "core/recursivesignalblocker.h"
#include "nexus.h"
#include "persistence/history.h"
#include "persistence/profile.h"
#include "persistence/settings.h"
#include "widget/form/setpassworddialog.h"
#include "widget/form/settingswidget.h"
#include "widget/gui.h"
#include "widget/translator.h"
#include "widget/widget.h"
#include "src/core/core.h"
#include "src/core/recursivesignalblocker.h"
#include "src/nexus.h"
#include "src/persistence/history.h"
#include "src/persistence/profile.h"
#include "src/persistence/settings.h"
#include "src/widget/form/setpassworddialog.h"
#include "src/widget/form/settingswidget.h"
#include "src/widget/gui.h"
#include "src/widget/translator.h"
#include "src/widget/widget.h"
PrivacyForm::PrivacyForm()
: GenericForm(QPixmap(":/img/settings/privacy.png"))

View File

@ -31,18 +31,18 @@
#include <QTime>
#include <QVector>
#include "core/core.h"
#include "core/coreav.h"
#include "core/recursivesignalblocker.h"
#include "net/autoupdate.h"
#include "nexus.h"
#include "persistence/profile.h"
#include "persistence/settings.h"
#include "persistence/smileypack.h"
#include "widget/form/settingswidget.h"
#include "widget/style.h"
#include "widget/translator.h"
#include "widget/widget.h"
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/core/recursivesignalblocker.h"
#include "src/net/autoupdate.h"
#include "src/nexus.h"
#include "src/persistence/profile.h"
#include "src/persistence/settings.h"
#include "src/persistence/smileypack.h"
#include "src/widget/form/settingswidget.h"
#include "src/widget/style.h"
#include "src/widget/translator.h"
#include "src/widget/widget.h"
/**
* @class UserInterfaceForm

View File

@ -21,7 +21,7 @@
#define USERINTERFACEFORM_H
#include "genericsettings.h"
#include "widget/form/settingswidget.h"
#include "src/widget/form/settingswidget.h"
namespace Ui {
class UserInterfaceSettings;

View File

@ -23,16 +23,16 @@
#include <QLabel>
#include <QWindow>
#include "video/camerasource.h"
#include "widget/widget.h"
#include "widget/form/settings/generalform.h"
#include "widget/form/settings/userinterfaceform.h"
#include "widget/form/settings/privacyform.h"
#include "widget/form/settings/avform.h"
#include "widget/form/settings/advancedform.h"
#include "widget/form/settings/aboutform.h"
#include "widget/translator.h"
#include "widget/contentlayout.h"
#include "src/video/camerasource.h"
#include "src/widget/widget.h"
#include "src/widget/form/settings/generalform.h"
#include "src/widget/form/settings/userinterfaceform.h"
#include "src/widget/form/settings/privacyform.h"
#include "src/widget/form/settings/avform.h"
#include "src/widget/form/settings/advancedform.h"
#include "src/widget/form/settings/aboutform.h"
#include "src/widget/translator.h"
#include "src/widget/contentlayout.h"
SettingsWidget::SettingsWidget(QWidget* parent)
: QWidget(parent, Qt::Window)

View File

@ -25,9 +25,9 @@
#include <QRegExp>
#include <QKeyEvent>
#include "core/core.h"
#include "group.h"
#include "widget/tool/chattextedit.h"
#include "src/core/core.h"
#include "src/group.h"
#include "src/widget/tool/chattextedit.h"
/**
* @file tabcompleter.h

View File

@ -25,8 +25,8 @@
#include <QString>
#include <QMap>
#include "group.h"
#include "widget/tool/chattextedit.h"
#include "src/group.h"
#include "src/widget/tool/chattextedit.h"
class TabCompleter : public QObject
{

View File

@ -13,8 +13,8 @@
*/
#include "friendlistlayout.h"
#include "friend.h"
#include "friendlist.h"
#include "src/friend.h"
#include "src/friendlist.h"
#include "friendwidget.h"
#include "friendlistwidget.h"
#include <cassert>

View File

@ -16,7 +16,7 @@
#define FRIENDLISTLAYOUT_H
#include <QBoxLayout>
#include "core/corestructs.h"
#include "src/core/corestructs.h"
#include "genericchatitemlayout.h"
class FriendWidget;

View File

@ -19,9 +19,9 @@
#include "friendlistwidget.h"
#include "friendlistlayout.h"
#include "friend.h"
#include "friendlist.h"
#include "persistence/settings.h"
#include "src/friend.h"
#include "src/friendlist.h"
#include "src/persistence/settings.h"
#include "friendwidget.h"
#include "groupwidget.h"
#include "circlewidget.h"

View File

@ -21,7 +21,7 @@
#define FRIENDLISTWIDGET_H
#include <QWidget>
#include "core/corestructs.h"
#include "src/core/corestructs.h"
#include "genericchatitemlayout.h"
class QVBoxLayout;

Some files were not shown because too many files have changed in this diff Show More