mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
refactor(style): use #pragma once rather than include guards
This commit is contained in:
parent
9306e946f8
commit
8abd4e47e9
|
@ -316,7 +316,7 @@ foo& g();
|
||||||
|
|
||||||
void f()
|
void f()
|
||||||
{
|
{
|
||||||
foo::bar(); // OK: no object necessary
|
foo::bar(); // OK: no object necessary
|
||||||
g().bar(); // Not OK: g() can cause side effects
|
g().bar(); // Not OK: g() can cause side effects
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
@ -378,6 +378,8 @@ Newlines can be present between includes to indicate logical grouping, however
|
||||||
be wary that clang-format does not sort includes properly this way, electing to
|
be wary that clang-format does not sort includes properly this way, electing to
|
||||||
sort each group individually according to the criteria defined above.
|
sort each group individually according to the criteria defined above.
|
||||||
|
|
||||||
|
Use `#pragma once` rather than include guards in header files. It reduces duplication and avoids a potential cause of bugs.
|
||||||
|
|
||||||
The following example demonstrates the above include rules:
|
The following example demonstrates the above include rules:
|
||||||
|
|
||||||
```c++
|
```c++
|
||||||
|
@ -572,4 +574,3 @@ For more info, see:
|
||||||
[String concatenation with QStringBuilder]: https://blog.qt.io/blog/2011/06/13/string-concatenation-with-qstringbuilder/
|
[String concatenation with QStringBuilder]: https://blog.qt.io/blog/2011/06/13/string-concatenation-with-qstringbuilder/
|
||||||
[Latin-1]: https://en.wikipedia.org/wiki/ISO/IEC_8859-1
|
[Latin-1]: https://en.wikipedia.org/wiki/ISO/IEC_8859-1
|
||||||
[CppCoreGuidelines]: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#main
|
[CppCoreGuidelines]: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#main
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef AUDIO_H
|
#pragma once
|
||||||
#define AUDIO_H
|
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
|
@ -30,5 +29,3 @@ class Audio
|
||||||
public:
|
public:
|
||||||
static std::unique_ptr<IAudioControl> makeAudio(IAudioSettings& settings);
|
static std::unique_ptr<IAudioControl> makeAudio(IAudioSettings& settings);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // AUDIO_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ALSINK_H
|
#pragma once
|
||||||
#define ALSINK_H
|
|
||||||
|
|
||||||
#include <QMutex>
|
#include <QMutex>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
@ -58,5 +57,3 @@ private:
|
||||||
bool killed = false;
|
bool killed = false;
|
||||||
mutable QMutex killLock;
|
mutable QMutex killLock;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // ALSINK_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ALSOURCE_H
|
#pragma once
|
||||||
#define ALSOURCE_H
|
|
||||||
|
|
||||||
#include "src/audio/iaudiosource.h"
|
#include "src/audio/iaudiosource.h"
|
||||||
#include <QMutex>
|
#include <QMutex>
|
||||||
|
@ -45,5 +44,3 @@ private:
|
||||||
bool killed = false;
|
bool killed = false;
|
||||||
mutable QMutex killLock;
|
mutable QMutex killLock;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // ALSOURCE_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef OPENAL_H
|
#pragma once
|
||||||
#define OPENAL_H
|
|
||||||
|
|
||||||
#include "src/audio/iaudiocontrol.h"
|
#include "src/audio/iaudiocontrol.h"
|
||||||
#include "src/audio/backend/alsink.h"
|
#include "src/audio/backend/alsink.h"
|
||||||
|
@ -164,5 +163,3 @@ protected:
|
||||||
const qreal maxInThreshold = 0.4;
|
const qreal maxInThreshold = 0.4;
|
||||||
int16_t* inputBuffer = nullptr;
|
int16_t* inputBuffer = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // OPENAL_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef IAUDIOCONTROL_H
|
#pragma once
|
||||||
#define IAUDIOCONTROL_H
|
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
|
@ -146,6 +145,3 @@ protected:
|
||||||
AUDIO_FRAME_DURATION * AUDIO_SAMPLE_RATE / 1000;
|
AUDIO_FRAME_DURATION * AUDIO_SAMPLE_RATE / 1000;
|
||||||
uint32_t AUDIO_FRAME_SAMPLE_COUNT_TOTAL = 0;
|
uint32_t AUDIO_FRAME_SAMPLE_COUNT_TOTAL = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif // IAUDIOCONTROL_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef I_AUDIO_SETTINGS_H
|
#pragma once
|
||||||
#define I_AUDIO_SETTINGS_H
|
|
||||||
|
|
||||||
#include "src/model/interface.h"
|
#include "src/model/interface.h"
|
||||||
|
|
||||||
|
@ -69,5 +68,3 @@ public:
|
||||||
DECLARE_SIGNAL(audioBitrateChanged, int bitrate);
|
DECLARE_SIGNAL(audioBitrateChanged, int bitrate);
|
||||||
DECLARE_SIGNAL(enableTestSoundChanged, bool newValue);
|
DECLARE_SIGNAL(enableTestSoundChanged, bool newValue);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // I_AUDIO_SETTINGS_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef IAUDIOSINK_H
|
#pragma once
|
||||||
#define IAUDIOSINK_H
|
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
@ -110,5 +109,3 @@ signals:
|
||||||
DECLARE_SIGNAL(finishedPlaying);
|
DECLARE_SIGNAL(finishedPlaying);
|
||||||
DECLARE_SIGNAL(invalidated);
|
DECLARE_SIGNAL(invalidated);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // IAUDIOSINK_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef IAUDIOSOURCE_H
|
#pragma once
|
||||||
#define IAUDIOSOURCE_H
|
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
|
@ -44,5 +43,3 @@ signals:
|
||||||
void volumeAvailable(float value);
|
void volumeAvailable(float value);
|
||||||
void invalidated();
|
void invalidated();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // IAUDIOSOURCE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHATLINE_H
|
#pragma once
|
||||||
#define CHATLINE_H
|
|
||||||
|
|
||||||
#include <QPointF>
|
#include <QPointF>
|
||||||
#include <QRectF>
|
#include <QRectF>
|
||||||
|
@ -116,5 +115,3 @@ private:
|
||||||
QRectF bbox;
|
QRectF bbox;
|
||||||
bool isVisible = false;
|
bool isVisible = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CHATLINE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHATLINECONTENT_H
|
#pragma once
|
||||||
#define CHATLINECONTENT_H
|
|
||||||
|
|
||||||
#include <QGraphicsItem>
|
#include <QGraphicsItem>
|
||||||
|
|
||||||
|
@ -69,5 +68,3 @@ private:
|
||||||
int row = -1;
|
int row = -1;
|
||||||
int col = -1;
|
int col = -1;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CHATLINECONTENT_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHATLINECONTENTPROXY_H
|
#pragma once
|
||||||
#define CHATLINECONTENTPROXY_H
|
|
||||||
|
|
||||||
#include "chatlinecontent.h"
|
#include "chatlinecontent.h"
|
||||||
#include <QGraphicsProxyWidget>
|
#include <QGraphicsProxyWidget>
|
||||||
|
@ -58,5 +57,3 @@ private:
|
||||||
int widthMin;
|
int widthMin;
|
||||||
const ChatLineContentProxyType widgetType;
|
const ChatLineContentProxyType widgetType;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CHATLINECONTENTPROXY_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHATLOG_H
|
#pragma once
|
||||||
#define CHATLOG_H
|
|
||||||
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QGraphicsView>
|
#include <QGraphicsView>
|
||||||
|
@ -189,5 +188,3 @@ private:
|
||||||
int numRemove{0};
|
int numRemove{0};
|
||||||
const int maxMessages{300};
|
const int maxMessages{300};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CHATLOG_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHATMESSAGE_H
|
#pragma once
|
||||||
#define CHATMESSAGE_H
|
|
||||||
|
|
||||||
#include "chatline.h"
|
#include "chatline.h"
|
||||||
#include "src/core/toxfile.h"
|
#include "src/core/toxfile.h"
|
||||||
|
@ -73,5 +72,3 @@ protected:
|
||||||
private:
|
private:
|
||||||
bool action = false;
|
bool action = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CHATMESSAGE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef BROKEN_H
|
#pragma once
|
||||||
#define BROKEN_H
|
|
||||||
|
|
||||||
#include "../chatlinecontent.h"
|
#include "../chatlinecontent.h"
|
||||||
|
|
||||||
|
@ -41,5 +40,3 @@ private:
|
||||||
QPixmap pmap;
|
QPixmap pmap;
|
||||||
QSize size;
|
QSize size;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // BROKEN_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FILETRANSFERWIDGET_H
|
#pragma once
|
||||||
#define FILETRANSFERWIDGET_H
|
|
||||||
|
|
||||||
#include <QTime>
|
#include <QTime>
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
@ -109,5 +108,3 @@ private:
|
||||||
LeftBottom = 8
|
LeftBottom = 8
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // FILETRANSFERWIDGET_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef IMAGE_H
|
#pragma once
|
||||||
#define IMAGE_H
|
|
||||||
|
|
||||||
#include "../chatlinecontent.h"
|
#include "../chatlinecontent.h"
|
||||||
|
|
||||||
|
@ -39,5 +38,3 @@ private:
|
||||||
QSize size;
|
QSize size;
|
||||||
QPixmap pmap;
|
QPixmap pmap;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // IMAGE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef NOTIFICATIONICON_H
|
#pragma once
|
||||||
#define NOTIFICATIONICON_H
|
|
||||||
|
|
||||||
#include "../chatlinecontent.h"
|
#include "../chatlinecontent.h"
|
||||||
|
|
||||||
|
@ -51,5 +50,3 @@ private:
|
||||||
qreal dotWidth = 0.2;
|
qreal dotWidth = 0.2;
|
||||||
qreal alpha = 0.0;
|
qreal alpha = 0.0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // NOTIFICATIONICON_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SPINNER_H
|
#pragma once
|
||||||
#define SPINNER_H
|
|
||||||
|
|
||||||
#include "../chatlinecontent.h"
|
#include "../chatlinecontent.h"
|
||||||
|
|
||||||
|
@ -52,5 +51,3 @@ private:
|
||||||
qreal alpha = 0.0;
|
qreal alpha = 0.0;
|
||||||
QVariantAnimation* blendAnimation;
|
QVariantAnimation* blendAnimation;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SPINNER_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TEXT_H
|
#pragma once
|
||||||
#define TEXT_H
|
|
||||||
|
|
||||||
#include "../chatlinecontent.h"
|
#include "../chatlinecontent.h"
|
||||||
#include "src/widget/style.h"
|
#include "src/widget/style.h"
|
||||||
|
@ -115,5 +114,3 @@ private:
|
||||||
QTextCursor selectCursor;
|
QTextCursor selectCursor;
|
||||||
std::pair<int, int> selectPoint{0, 0};
|
std::pair<int, int> selectPoint{0, 0};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TEXT_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TIMESTAMP_H
|
#pragma once
|
||||||
#define TIMESTAMP_H
|
|
||||||
|
|
||||||
#include "text.h"
|
#include "text.h"
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
@ -39,5 +38,3 @@ protected:
|
||||||
private:
|
private:
|
||||||
QDateTime time;
|
QDateTime time;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TIMESTAMP_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CUSTOMTEXTDOCUMENT_H
|
#pragma once
|
||||||
#define CUSTOMTEXTDOCUMENT_H
|
|
||||||
|
|
||||||
#include <QTextDocument>
|
#include <QTextDocument>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
|
@ -39,5 +38,3 @@ protected:
|
||||||
private:
|
private:
|
||||||
QList<std::shared_ptr<QIcon>> emoticonIcons;
|
QList<std::shared_ptr<QIcon>> emoticonIcons;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CUSTOMTEXTDOCUMENT_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef DOCUMENTCACHE_H
|
#pragma once
|
||||||
#define DOCUMENTCACHE_H
|
|
||||||
|
|
||||||
#include <QStack>
|
#include <QStack>
|
||||||
|
|
||||||
|
@ -41,5 +40,3 @@ private:
|
||||||
private:
|
private:
|
||||||
QStack<QTextDocument*> documents;
|
QStack<QTextDocument*> documents;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // DOCUMENTCACHE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ICONCACHE_H
|
#pragma once
|
||||||
#define ICONCACHE_H
|
|
||||||
|
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
|
@ -40,5 +39,3 @@ protected:
|
||||||
private:
|
private:
|
||||||
QHash<QString, QIcon> cache;
|
QHash<QString, QIcon> cache;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // ICONCACHE_H
|
|
||||||
|
|
|
@ -17,13 +17,10 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TEXTFORMATTER_H
|
#pragma once
|
||||||
#define TEXTFORMATTER_H
|
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
QString highlightURI(const QString& message);
|
QString highlightURI(const QString& message);
|
||||||
|
|
||||||
QString applyMarkdown(const QString& message, bool showFormattingSymbols);
|
QString applyMarkdown(const QString& message, bool showFormattingSymbols);
|
||||||
|
|
||||||
#endif // TEXTFORMATTER_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOXFILEPROGRESS_H
|
#pragma once
|
||||||
#define TOXFILEPROGRESS_H
|
|
||||||
|
|
||||||
#include <QTime>
|
#include <QTime>
|
||||||
|
|
||||||
|
@ -48,6 +47,3 @@ private:
|
||||||
double timeLeftSeconds;
|
double timeLeftSeconds;
|
||||||
double progress;
|
double progress;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif // TOXFILEPROGRESS_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONTACTID_H
|
#pragma once
|
||||||
#define CONTACTID_H
|
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
@ -53,5 +52,3 @@ inline uint qHash(const ContactId& id)
|
||||||
}
|
}
|
||||||
|
|
||||||
using ContactIdPtr = std::shared_ptr<const ContactId>;
|
using ContactIdPtr = std::shared_ptr<const ContactId>;
|
||||||
|
|
||||||
#endif // CONTACTID_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CORE_HPP
|
#pragma once
|
||||||
#define CORE_HPP
|
|
||||||
|
|
||||||
#include "groupid.h"
|
#include "groupid.h"
|
||||||
#include "icorefriendmessagesender.h"
|
#include "icorefriendmessagesender.h"
|
||||||
|
@ -253,5 +252,3 @@ private:
|
||||||
|
|
||||||
std::unique_ptr<QThread> coreThread;
|
std::unique_ptr<QThread> coreThread;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CORE_HPP
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef COREAV_H
|
#pragma once
|
||||||
#define COREAV_H
|
|
||||||
|
|
||||||
#include "src/core/toxcall.h"
|
#include "src/core/toxcall.h"
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
@ -158,5 +157,3 @@ private:
|
||||||
*/
|
*/
|
||||||
QMutex& coreLock;
|
QMutex& coreLock;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // COREAV_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef COREFILE_H
|
#pragma once
|
||||||
#define COREFILE_H
|
|
||||||
|
|
||||||
#include <tox/tox.h>
|
#include <tox/tox.h>
|
||||||
|
|
||||||
|
@ -109,5 +108,3 @@ private:
|
||||||
Tox* tox;
|
Tox* tox;
|
||||||
QMutex* coreLoopLock = nullptr;
|
QMutex* coreLoopLock = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // COREFILE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef DHT_SERVER_H
|
#pragma once
|
||||||
#define DHT_SERVER_H
|
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
|
@ -32,5 +31,3 @@ struct DhtServer
|
||||||
bool operator==(const DhtServer& other) const;
|
bool operator==(const DhtServer& other) const;
|
||||||
bool operator!=(const DhtServer& other) const;
|
bool operator!=(const DhtServer& other) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // DHT_SERVER_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef GROUPID_H
|
#pragma once
|
||||||
#define GROUPID_H
|
|
||||||
|
|
||||||
#include "src/core/contactid.h"
|
#include "src/core/contactid.h"
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
|
@ -33,5 +32,3 @@ public:
|
||||||
explicit GroupId(const uint8_t* rawId);
|
explicit GroupId(const uint8_t* rawId);
|
||||||
int getSize() const override;
|
int getSize() const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GROUPID_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ICORE_FRIEND_MESSAGE_SENDER_H
|
#pragma once
|
||||||
#define ICORE_FRIEND_MESSAGE_SENDER_H
|
|
||||||
|
|
||||||
#include "receiptnum.h"
|
#include "receiptnum.h"
|
||||||
|
|
||||||
|
@ -32,6 +31,3 @@ public:
|
||||||
virtual bool sendAction(uint32_t friendId, const QString& action, ReceiptNum& receipt) = 0;
|
virtual bool sendAction(uint32_t friendId, const QString& action, ReceiptNum& receipt) = 0;
|
||||||
virtual bool sendMessage(uint32_t friendId, const QString& message, ReceiptNum& receipt) = 0;
|
virtual bool sendMessage(uint32_t friendId, const QString& message, ReceiptNum& receipt) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif /* ICORE_FRIEND_MESSAGE_SENDER_H */
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ICORE_GROUP_MESSAGE_SENDER_H
|
#pragma once
|
||||||
#define ICORE_GROUP_MESSAGE_SENDER_H
|
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
|
@ -29,5 +28,3 @@ public:
|
||||||
virtual void sendGroupAction(int groupId, const QString& message) = 0;
|
virtual void sendGroupAction(int groupId, const QString& message) = 0;
|
||||||
virtual void sendGroupMessage(int groupId, const QString& message) = 0;
|
virtual void sendGroupMessage(int groupId, const QString& message) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*ICORE_GROUP_MESSAGE_SENDER_H*/
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ICORE_GROUP_QUERY_H
|
#pragma once
|
||||||
#define ICORE_GROUP_QUERY_H
|
|
||||||
|
|
||||||
#include "groupid.h"
|
#include "groupid.h"
|
||||||
#include "toxpk.h"
|
#include "toxpk.h"
|
||||||
|
@ -40,5 +39,3 @@ public:
|
||||||
virtual QStringList getGroupPeerNames(int groupId) const = 0;
|
virtual QStringList getGroupPeerNames(int groupId) const = 0;
|
||||||
virtual bool getGroupAvEnabled(int groupId) const = 0;
|
virtual bool getGroupAvEnabled(int groupId) const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*ICORE_GROUP_QUERY_H*/
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ICORE_ID_HANDLER_H
|
#pragma once
|
||||||
#define ICORE_ID_HANDLER_H
|
|
||||||
|
|
||||||
#include "toxid.h"
|
#include "toxid.h"
|
||||||
#include "toxpk.h"
|
#include "toxpk.h"
|
||||||
|
@ -32,6 +31,3 @@ public:
|
||||||
virtual ToxPk getSelfPublicKey() const = 0;
|
virtual ToxPk getSelfPublicKey() const = 0;
|
||||||
virtual QString getUsername() const = 0;
|
virtual QString getUsername() const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif /*ICORE_ID_HANDLER_H*/
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef I_CORE_SETTINGS_H
|
#pragma once
|
||||||
#define I_CORE_SETTINGS_H
|
|
||||||
|
|
||||||
#include "src/model/interface.h"
|
#include "src/model/interface.h"
|
||||||
|
|
||||||
|
@ -64,5 +63,3 @@ public:
|
||||||
DECLARE_SIGNAL(proxyAddressChanged, const QString& address);
|
DECLARE_SIGNAL(proxyAddressChanged, const QString& address);
|
||||||
DECLARE_SIGNAL(proxyPortChanged, quint16 port);
|
DECLARE_SIGNAL(proxyPortChanged, quint16 port);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // I_CORE_SETTINGS_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef RECEIPT_NUM_H
|
#pragma once
|
||||||
#define RECEIPT_NUM_H
|
|
||||||
|
|
||||||
#include "src/util/strongtype.h"
|
#include "src/util/strongtype.h"
|
||||||
|
|
||||||
|
@ -27,5 +26,3 @@
|
||||||
|
|
||||||
using ReceiptNum = NamedType<uint32_t, struct ReceiptNumTag, Orderable>;
|
using ReceiptNum = NamedType<uint32_t, struct ReceiptNumTag, Orderable>;
|
||||||
Q_DECLARE_METATYPE(ReceiptNum)
|
Q_DECLARE_METATYPE(ReceiptNum)
|
||||||
|
|
||||||
#endif /* RECEIPT_NUM_H */
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOXCALL_H
|
#pragma once
|
||||||
#define TOXCALL_H
|
|
||||||
|
|
||||||
#include "src/audio/iaudiocontrol.h"
|
#include "src/audio/iaudiocontrol.h"
|
||||||
#include "src/audio/iaudiosink.h"
|
#include "src/audio/iaudiosink.h"
|
||||||
|
@ -141,5 +140,3 @@ private slots:
|
||||||
void onAudioSourceInvalidated();
|
void onAudioSourceInvalidated();
|
||||||
void onAudioSinkInvalidated(ToxPk peerId);
|
void onAudioSinkInvalidated(ToxPk peerId);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TOXCALL_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOXENCRYPT_H
|
#pragma once
|
||||||
#define TOXENCRYPT_H
|
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
@ -51,5 +50,3 @@ private:
|
||||||
private:
|
private:
|
||||||
Tox_Pass_Key* passKey = nullptr;
|
Tox_Pass_Key* passKey = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TOXENCRYPT_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CORESTRUCTS_H
|
#pragma once
|
||||||
#define CORESTRUCTS_H
|
|
||||||
|
|
||||||
#include "src/core/toxfilepause.h"
|
#include "src/core/toxfilepause.h"
|
||||||
|
|
||||||
|
@ -76,5 +75,3 @@ struct ToxFile
|
||||||
std::shared_ptr<QCryptographicHash> hashGenerator = std::make_shared<QCryptographicHash>(QCryptographicHash::Sha256);
|
std::shared_ptr<QCryptographicHash> hashGenerator = std::make_shared<QCryptographicHash>(QCryptographicHash::Sha256);
|
||||||
ToxFilePause pauseStatus;
|
ToxFilePause pauseStatus;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CORESTRUCTS_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOX_FILE_PAUSE_H
|
#pragma once
|
||||||
#define TOX_FILE_PAUSE_H
|
|
||||||
|
|
||||||
class ToxFilePause
|
class ToxFilePause
|
||||||
{
|
{
|
||||||
|
@ -72,5 +71,3 @@ private:
|
||||||
bool localPauseState = false;
|
bool localPauseState = false;
|
||||||
bool remotePauseState = false;
|
bool remotePauseState = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TOX_FILE_PAUSE_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef TOXID_H
|
#pragma once
|
||||||
#define TOXID_H
|
|
||||||
|
|
||||||
#include "toxpk.h"
|
#include "toxpk.h"
|
||||||
|
|
||||||
|
@ -60,5 +59,3 @@ public:
|
||||||
private:
|
private:
|
||||||
QByteArray toxId;
|
QByteArray toxId;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TOXID_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOXLOGGER_H
|
#pragma once
|
||||||
#define TOXLOGGER_H
|
|
||||||
|
|
||||||
#include <tox/tox.h>
|
#include <tox/tox.h>
|
||||||
|
|
||||||
|
@ -28,5 +27,3 @@ namespace ToxLogger {
|
||||||
void onLogMessage(Tox *tox, Tox_Log_Level level, const char *file, uint32_t line,
|
void onLogMessage(Tox *tox, Tox_Log_Level level, const char *file, uint32_t line,
|
||||||
const char *func, const char *message, void *user_data);
|
const char *func, const char *message, void *user_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // TOXLOGGER_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOXOPTIONS_H
|
#pragma once
|
||||||
#define TOXOPTIONS_H
|
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
|
|
||||||
|
@ -46,5 +45,3 @@ private:
|
||||||
Tox_Options* options = nullptr;
|
Tox_Options* options = nullptr;
|
||||||
QByteArray proxyAddrData;
|
QByteArray proxyAddrData;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TOXOPTIONS_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOXPK_H
|
#pragma once
|
||||||
#define TOXPK_H
|
|
||||||
|
|
||||||
#include "src/core/contactid.h"
|
#include "src/core/contactid.h"
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
|
@ -33,5 +32,3 @@ public:
|
||||||
explicit ToxPk(const uint8_t* rawId);
|
explicit ToxPk(const uint8_t* rawId);
|
||||||
int getSize() const override;
|
int getSize() const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TOXPK_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOXSTRING_H
|
#pragma once
|
||||||
#define TOXSTRING_H
|
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
@ -40,4 +39,3 @@ public:
|
||||||
private:
|
private:
|
||||||
QByteArray string;
|
QByteArray string;
|
||||||
};
|
};
|
||||||
#endif // TOXSTRING_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FRIENDLIST_H
|
#pragma once
|
||||||
#define FRIENDLIST_H
|
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
|
@ -46,5 +45,3 @@ private:
|
||||||
static QHash<ToxPk, Friend*> friendList;
|
static QHash<ToxPk, Friend*> friendList;
|
||||||
static QHash<uint32_t, ToxPk> id2key;
|
static QHash<uint32_t, ToxPk> id2key;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // FRIENDLIST_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef GROUPLIST_H
|
#pragma once
|
||||||
#define GROUPLIST_H
|
|
||||||
|
|
||||||
#include "src/core/groupid.h"
|
#include "src/core/groupid.h"
|
||||||
|
|
||||||
|
@ -43,5 +42,3 @@ private:
|
||||||
static QHash<const GroupId, Group*> groupList;
|
static QHash<const GroupId, Group*> groupList;
|
||||||
static QHash<uint32_t, GroupId> id2key;
|
static QHash<uint32_t, GroupId> id2key;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GROUPLIST_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef IPC_H
|
#pragma once
|
||||||
#define IPC_H
|
|
||||||
|
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
@ -91,5 +90,3 @@ private:
|
||||||
QSharedMemory globalMemory;
|
QSharedMemory globalMemory;
|
||||||
QMap<QString, IPCEventHandler> eventHandlers;
|
QMap<QString, IPCEventHandler> eventHandlers;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // IPC_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ABOUT_FRIEND_H
|
#pragma once
|
||||||
#define ABOUT_FRIEND_H
|
|
||||||
|
|
||||||
#include "iaboutfriend.h"
|
#include "iaboutfriend.h"
|
||||||
#include "src/model/interface.h"
|
#include "src/model/interface.h"
|
||||||
|
@ -72,5 +71,3 @@ private:
|
||||||
const Friend* const f;
|
const Friend* const f;
|
||||||
IFriendSettings* const settings;
|
IFriendSettings* const settings;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // ABOUT_FRIEND_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef I_ABOUT_FRIEND_H
|
#pragma once
|
||||||
#define I_ABOUT_FRIEND_H
|
|
||||||
|
|
||||||
#include "src/model/interface.h"
|
#include "src/model/interface.h"
|
||||||
#include "src/persistence/ifriendsettings.h"
|
#include "src/persistence/ifriendsettings.h"
|
||||||
|
@ -62,5 +61,3 @@ public:
|
||||||
DECLARE_SIGNAL(autoAcceptCallChanged, IFriendSettings::AutoAcceptCallFlags);
|
DECLARE_SIGNAL(autoAcceptCallChanged, IFriendSettings::AutoAcceptCallFlags);
|
||||||
DECLARE_SIGNAL(autoGroupInviteChanged, bool);
|
DECLARE_SIGNAL(autoGroupInviteChanged, bool);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // I_ABOUT_FRIEND_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHAT_HISTORY_H
|
#pragma once
|
||||||
#define CHAT_HISTORY_H
|
|
||||||
|
|
||||||
#include "ichatlog.h"
|
#include "ichatlog.h"
|
||||||
#include "sessionchatlog.h"
|
#include "sessionchatlog.h"
|
||||||
|
@ -76,5 +75,3 @@ private:
|
||||||
// callback it will end up in this map
|
// callback it will end up in this map
|
||||||
QMap<DispatchedMessageId, RowId> dispatchedMessageRowIdMap;
|
QMap<DispatchedMessageId, RowId> dispatchedMessageRowIdMap;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*CHAT_HISTORY_H*/
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHAT_LOG_ITEM_H
|
#pragma once
|
||||||
#define CHAT_LOG_ITEM_H
|
|
||||||
|
|
||||||
#include "src/core/toxfile.h"
|
#include "src/core/toxfile.h"
|
||||||
#include "src/core/toxpk.h"
|
#include "src/core/toxpk.h"
|
||||||
|
@ -72,5 +71,3 @@ private:
|
||||||
|
|
||||||
ContentPtr content;
|
ContentPtr content;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*CHAT_LOG_ITEM_H*/
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MODEL_CHATROOM_H
|
#pragma once
|
||||||
#define MODEL_CHATROOM_H
|
|
||||||
|
|
||||||
#include "src/model/contact.h"
|
#include "src/model/contact.h"
|
||||||
|
|
||||||
|
@ -27,5 +26,3 @@ class Chatroom
|
||||||
public:
|
public:
|
||||||
virtual Contact* getContact() = 0;
|
virtual Contact* getContact() = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* MODEL_CHATROOM_H */
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FRIEND_CHATROOM_H
|
#pragma once
|
||||||
#define FRIEND_CHATROOM_H
|
|
||||||
|
|
||||||
#include "chatroom.h"
|
#include "chatroom.h"
|
||||||
|
|
||||||
|
@ -87,5 +86,3 @@ private:
|
||||||
Friend* frnd{nullptr};
|
Friend* frnd{nullptr};
|
||||||
IDialogsManager* dialogsManager{nullptr};
|
IDialogsManager* dialogsManager{nullptr};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // FRIEND_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef GROUP_CHATROOM_H
|
#pragma once
|
||||||
#define GROUP_CHATROOM_H
|
|
||||||
|
|
||||||
#include "chatroom.h"
|
#include "chatroom.h"
|
||||||
|
|
||||||
|
@ -52,5 +51,3 @@ private:
|
||||||
Group* group{nullptr};
|
Group* group{nullptr};
|
||||||
IDialogsManager* dialogsManager{nullptr};
|
IDialogsManager* dialogsManager{nullptr};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* GROUP_CHATROOM_H */
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONTACT_H
|
#pragma once
|
||||||
#define CONTACT_H
|
|
||||||
|
|
||||||
#include "src/core/contactid.h"
|
#include "src/core/contactid.h"
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
@ -42,5 +41,3 @@ public:
|
||||||
signals:
|
signals:
|
||||||
void displayedNameChanged(const QString& newName);
|
void displayedNameChanged(const QString& newName);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CONTACT_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef I_DIALOGS_H
|
#pragma once
|
||||||
#define I_DIALOGS_H
|
|
||||||
|
|
||||||
class ContactId;
|
class ContactId;
|
||||||
class GroupId;
|
class GroupId;
|
||||||
|
@ -36,5 +35,3 @@ public:
|
||||||
|
|
||||||
virtual int chatroomCount() const = 0;
|
virtual int chatroomCount() const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // I_DIALOGS_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef I_DIALOGS_MANAGER
|
#pragma once
|
||||||
#define I_DIALOGS_MANAGER
|
|
||||||
|
|
||||||
#include "idialogs.h"
|
#include "idialogs.h"
|
||||||
|
|
||||||
|
@ -32,5 +31,3 @@ public:
|
||||||
virtual IDialogs* getFriendDialogs(const ToxPk& friendPk) const = 0;
|
virtual IDialogs* getFriendDialogs(const ToxPk& friendPk) const = 0;
|
||||||
virtual IDialogs* getGroupDialogs(const GroupId& groupId) const = 0;
|
virtual IDialogs* getGroupDialogs(const GroupId& groupId) const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // I_DIALOGS_MANAGER
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FRIEND_H
|
#pragma once
|
||||||
#define FRIEND_H
|
|
||||||
|
|
||||||
#include "contact.h"
|
#include "contact.h"
|
||||||
#include "src/core/core.h"
|
#include "src/core/core.h"
|
||||||
|
@ -74,5 +73,3 @@ private:
|
||||||
bool hasNewEvents;
|
bool hasNewEvents;
|
||||||
Status::Status friendStatus;
|
Status::Status friendStatus;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // FRIEND_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FRIEND_MESSAGE_DISPATCHER_H
|
#pragma once
|
||||||
#define FRIEND_MESSAGE_DISPATCHER_H
|
|
||||||
|
|
||||||
#include "src/core/icorefriendmessagesender.h"
|
#include "src/core/icorefriendmessagesender.h"
|
||||||
#include "src/model/friend.h"
|
#include "src/model/friend.h"
|
||||||
|
@ -54,6 +53,3 @@ private:
|
||||||
OfflineMsgEngine offlineMsgEngine;
|
OfflineMsgEngine offlineMsgEngine;
|
||||||
MessageProcessor processor;
|
MessageProcessor processor;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif /* IMESSAGE_DISPATCHER_H */
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef GROUP_H
|
#pragma once
|
||||||
#define GROUP_H
|
|
||||||
|
|
||||||
#include "contact.h"
|
#include "contact.h"
|
||||||
|
|
||||||
|
@ -86,5 +85,3 @@ private:
|
||||||
const GroupId groupId;
|
const GroupId groupId;
|
||||||
bool avGroupchat;
|
bool avGroupchat;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GROUP_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef GROUPINVITE_H
|
#pragma once
|
||||||
#define GROUPINVITE_H
|
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
@ -42,5 +41,3 @@ private:
|
||||||
QByteArray invite;
|
QByteArray invite;
|
||||||
QDateTime date;
|
QDateTime date;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GROUPINVITE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef GROUP_MESSAGE_DISPATCHER_H
|
#pragma once
|
||||||
#define GROUP_MESSAGE_DISPATCHER_H
|
|
||||||
|
|
||||||
#include "src/core/icoregroupmessagesender.h"
|
#include "src/core/icoregroupmessagesender.h"
|
||||||
#include "src/core/icoreidhandler.h"
|
#include "src/core/icoreidhandler.h"
|
||||||
|
@ -53,6 +52,3 @@ private:
|
||||||
const IGroupSettings& groupSettings;
|
const IGroupSettings& groupSettings;
|
||||||
DispatchedMessageId nextMessageId{0};
|
DispatchedMessageId nextMessageId{0};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif /* IMESSAGE_DISPATCHER_H */
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ICHAT_LOG_H
|
#pragma once
|
||||||
#define ICHAT_LOG_H
|
|
||||||
|
|
||||||
#include "message.h"
|
#include "message.h"
|
||||||
#include "src/core/core.h"
|
#include "src/core/core.h"
|
||||||
|
@ -141,5 +140,3 @@ public:
|
||||||
signals:
|
signals:
|
||||||
void itemUpdated(ChatLogIdx idx);
|
void itemUpdated(ChatLogIdx idx);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*ICHAT_LOG_H*/
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef IMESSAGE_DISPATCHER_H
|
#pragma once
|
||||||
#define IMESSAGE_DISPATCHER_H
|
|
||||||
|
|
||||||
#include "src/model/friend.h"
|
#include "src/model/friend.h"
|
||||||
#include "src/model/message.h"
|
#include "src/model/message.h"
|
||||||
|
@ -64,5 +63,3 @@ signals:
|
||||||
*/
|
*/
|
||||||
void messageComplete(DispatchedMessageId id);
|
void messageComplete(DispatchedMessageId id);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* IMESSAGE_DISPATCHER_H */
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef INTERFACE_H
|
#pragma once
|
||||||
#define INTERFACE_H
|
|
||||||
|
|
||||||
#include <QMetaObject>
|
#include <QMetaObject>
|
||||||
|
|
||||||
|
@ -70,5 +69,3 @@
|
||||||
QMetaObject::Connection connectTo_##name(QObject *receiver, Slot_##name slot) const override { \
|
QMetaObject::Connection connectTo_##name(QObject *receiver, Slot_##name slot) const override { \
|
||||||
return connect(this, &classname::name, receiver, slot); \
|
return connect(this, &classname::name, receiver, slot); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // INTERFACE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MESSAGE_H
|
#pragma once
|
||||||
#define MESSAGE_H
|
|
||||||
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QRegularExpression>
|
#include <QRegularExpression>
|
||||||
|
@ -114,5 +113,3 @@ private:
|
||||||
bool detectingMentions = false;
|
bool detectingMentions = false;
|
||||||
const SharedParams& sharedParams;
|
const SharedParams& sharedParams;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*MESSAGE_H*/
|
|
||||||
|
|
|
@ -17,6 +17,8 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#include "src/model/interface.h"
|
#include "src/model/interface.h"
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
|
@ -17,6 +17,8 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include "src/model/interface.h"
|
#include "src/model/interface.h"
|
||||||
#include "src/core/toxpk.h"
|
#include "src/core/toxpk.h"
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SESSION_CHAT_LOG_H
|
#pragma once
|
||||||
#define SESSION_CHAT_LOG_H
|
|
||||||
|
|
||||||
#include "ichatlog.h"
|
#include "ichatlog.h"
|
||||||
#include "imessagedispatcher.h"
|
#include "imessagedispatcher.h"
|
||||||
|
@ -89,5 +88,3 @@ private:
|
||||||
*/
|
*/
|
||||||
QMap<DispatchedMessageId, ChatLogIdx> outgoingMessages;
|
QMap<DispatchedMessageId, ChatLogIdx> outgoingMessages;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*SESSION_CHAT_LOG_H*/
|
|
||||||
|
|
|
@ -20,8 +20,7 @@
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QPixmap>
|
#include <QPixmap>
|
||||||
|
|
||||||
#ifndef STATUS_H
|
#pragma once
|
||||||
#define STATUS_H
|
|
||||||
|
|
||||||
namespace Status
|
namespace Status
|
||||||
{
|
{
|
||||||
|
@ -40,5 +39,3 @@ namespace Status
|
||||||
QString getAssetSuffix(Status status);
|
QString getAssetSuffix(Status status);
|
||||||
bool isOnline(Status status);
|
bool isOnline(Status status);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // STATUS_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOXCLIENTSTANDARDS_H
|
#pragma once
|
||||||
#define TOXCLIENTSTANDARDS_H
|
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
|
@ -31,5 +30,3 @@ namespace ToxClientStandards
|
||||||
return fileSize <= MaxAvatarSize;
|
return fileSize <= MaxAvatarSize;
|
||||||
}
|
}
|
||||||
} // ToxClientStandards
|
} // ToxClientStandards
|
||||||
|
|
||||||
#endif // TOXCLIENTSTANDARDS_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef AVATARBROADCASTER_H
|
#pragma once
|
||||||
#define AVATARBROADCASTER_H
|
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
|
@ -38,5 +37,3 @@ private:
|
||||||
static QByteArray avatarData;
|
static QByteArray avatarData;
|
||||||
static QMap<uint32_t, bool> friendsSentTo;
|
static QMap<uint32_t, bool> friendsSentTo;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // AVATARBROADCASTER_H
|
|
||||||
|
|
|
@ -1,5 +1,23 @@
|
||||||
#ifndef BOOTSTRAPNODEUPDATER_H
|
/*
|
||||||
#define BOOTSTRAPNODEUPDATER_H
|
Copyright © 2018-2020 by The qTox Project Contributors
|
||||||
|
|
||||||
|
This file is part of qTox, a Qt-based graphical interface for Tox.
|
||||||
|
|
||||||
|
qTox is libre software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
qTox is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#include <QList>
|
#include <QList>
|
||||||
#include <QNetworkAccessManager>
|
#include <QNetworkAccessManager>
|
||||||
|
@ -32,5 +50,3 @@ private:
|
||||||
QNetworkProxy proxy;
|
QNetworkProxy proxy;
|
||||||
QNetworkAccessManager nam;
|
QNetworkAccessManager nam;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // BOOTSTRAPNODEUPDATER_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef TOXURI_H
|
#pragma once
|
||||||
#define TOXURI_H
|
|
||||||
|
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
|
||||||
|
@ -39,5 +38,3 @@ public:
|
||||||
private:
|
private:
|
||||||
QPlainTextEdit* messageEdit;
|
QPlainTextEdit* messageEdit;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TOXURI_H
|
|
||||||
|
|
|
@ -16,6 +16,9 @@
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#include <QNetworkAccessManager>
|
#include <QNetworkAccessManager>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef NEXUS_H
|
#pragma once
|
||||||
#define NEXUS_H
|
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
|
@ -106,5 +105,3 @@ private:
|
||||||
std::unique_ptr<IAudioControl> audioControl;
|
std::unique_ptr<IAudioControl> audioControl;
|
||||||
QCommandLineParser* parser = nullptr;
|
QCommandLineParser* parser = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // NEXUS_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef RAWDATABASE_H
|
#pragma once
|
||||||
#define RAWDATABASE_H
|
|
||||||
|
|
||||||
#include "src/util/strongtype.h"
|
#include "src/util/strongtype.h"
|
||||||
|
|
||||||
|
@ -177,5 +176,3 @@ private:
|
||||||
QByteArray currentSalt;
|
QByteArray currentSalt;
|
||||||
QString currentHexKey;
|
QString currentHexKey;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // RAWDATABASE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef HISTORY_H
|
#pragma once
|
||||||
#define HISTORY_H
|
|
||||||
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
|
@ -220,5 +219,3 @@ private:
|
||||||
// This needs to be a shared pointer to avoid callback lifetime issues
|
// This needs to be a shared pointer to avoid callback lifetime issues
|
||||||
QHash<QString, FileInfo> fileInfos;
|
QHash<QString, FileInfo> fileInfos;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // HISTORY_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef I_FRIEND_SETTINGS_H
|
#pragma once
|
||||||
#define I_FRIEND_SETTINGS_H
|
|
||||||
|
|
||||||
#include "src/model/interface.h"
|
#include "src/model/interface.h"
|
||||||
|
|
||||||
|
@ -73,4 +72,3 @@ signals:
|
||||||
};
|
};
|
||||||
|
|
||||||
Q_DECLARE_OPERATORS_FOR_FLAGS(IFriendSettings::AutoAcceptCallFlags)
|
Q_DECLARE_OPERATORS_FOR_FLAGS(IFriendSettings::AutoAcceptCallFlags)
|
||||||
#endif // I_FRIEND_SETTINGS_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef IGROUP_SETTINGS_H
|
#pragma once
|
||||||
#define IGROUP_SETTINGS_H
|
|
||||||
|
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
|
|
||||||
|
@ -31,5 +30,3 @@ public:
|
||||||
virtual bool getGroupAlwaysNotify() const = 0;
|
virtual bool getGroupAlwaysNotify() const = 0;
|
||||||
virtual void setGroupAlwaysNotify(bool newValue) = 0;
|
virtual void setGroupAlwaysNotify(bool newValue) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*IGROUP_SETTINGS_H*/
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef OFFLINEMSGENGINE_H
|
#pragma once
|
||||||
#define OFFLINEMSGENGINE_H
|
|
||||||
|
|
||||||
#include "src/chatlog/chatmessage.h"
|
#include "src/chatlog/chatmessage.h"
|
||||||
#include "src/core/core.h"
|
#include "src/core/core.h"
|
||||||
|
@ -70,5 +69,3 @@ private:
|
||||||
QMap<ReceiptNum, OfflineMessage> sentMessages;
|
QMap<ReceiptNum, OfflineMessage> sentMessages;
|
||||||
QVector<OfflineMessage> unsentMessages;
|
QVector<OfflineMessage> unsentMessages;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // OFFLINEMSGENGINE_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef PATHS_H
|
#pragma once
|
||||||
#define PATHS_H
|
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
|
@ -50,5 +49,3 @@ private:
|
||||||
QString basePath{};
|
QString basePath{};
|
||||||
bool portable = false;
|
bool portable = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PATHS_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef PROFILE_H
|
#pragma once
|
||||||
#define PROFILE_H
|
|
||||||
|
|
||||||
#include "src/core/core.h"
|
#include "src/core/core.h"
|
||||||
#include "src/core/toxencrypt.h"
|
#include "src/core/toxencrypt.h"
|
||||||
|
@ -118,5 +117,3 @@ private:
|
||||||
bool encrypted = false;
|
bool encrypted = false;
|
||||||
static QStringList profiles;
|
static QStringList profiles;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PROFILE_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef PROFILELOCKER_H
|
#pragma once
|
||||||
#define PROFILELOCKER_H
|
|
||||||
|
|
||||||
#include <QLockFile>
|
#include <QLockFile>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
@ -45,5 +44,3 @@ private:
|
||||||
static std::unique_ptr<QLockFile> lockfile;
|
static std::unique_ptr<QLockFile> lockfile;
|
||||||
static QString curLockName;
|
static QString curLockName;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PROFILELOCKER_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef SERIALIZE_H
|
#pragma once
|
||||||
#define SERIALIZE_H
|
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
@ -32,5 +31,3 @@ size_t dataToVUint(const QByteArray& data);
|
||||||
unsigned getVUint32Size(QByteArray data);
|
unsigned getVUint32Size(QByteArray data);
|
||||||
QByteArray vintToData(int num);
|
QByteArray vintToData(int num);
|
||||||
QByteArray vuintToData(size_t num);
|
QByteArray vuintToData(size_t num);
|
||||||
|
|
||||||
#endif // SERIALIZE_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SETTINGS_HPP
|
#pragma once
|
||||||
#define SETTINGS_HPP
|
|
||||||
|
|
||||||
#include "src/audio/iaudiosettings.h"
|
#include "src/audio/iaudiosettings.h"
|
||||||
#include "src/core/icoresettings.h"
|
#include "src/core/icoresettings.h"
|
||||||
|
@ -708,5 +707,3 @@ private:
|
||||||
static const QString globalSettingsFile;
|
static const QString globalSettingsFile;
|
||||||
static QThread* settingsThread;
|
static QThread* settingsThread;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SETTINGS_HPP
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SETTINGSSERIALIZER_H
|
#pragma once
|
||||||
#define SETTINGSSERIALIZER_H
|
|
||||||
|
|
||||||
#include "src/core/toxencrypt.h"
|
#include "src/core/toxencrypt.h"
|
||||||
|
|
||||||
|
@ -111,5 +110,3 @@ private:
|
||||||
QVector<Value> values;
|
QVector<Value> values;
|
||||||
static const char magic[];
|
static const char magic[];
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SETTINGSSERIALIZER_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SMILEYPACK_H
|
#pragma once
|
||||||
#define SMILEYPACK_H
|
|
||||||
|
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
|
@ -63,5 +62,3 @@ private:
|
||||||
QRegularExpression smilify;
|
QRegularExpression smilify;
|
||||||
mutable QMutex loadingMutex;
|
mutable QMutex loadingMutex;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SMILEYPACK_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOXSAVE_H
|
#pragma once
|
||||||
#define TOXSAVE_H
|
|
||||||
|
|
||||||
class QString;
|
class QString;
|
||||||
class QByteArray;
|
class QByteArray;
|
||||||
|
@ -27,5 +26,3 @@ bool handleToxSave(const QString& path);
|
||||||
|
|
||||||
// Internals
|
// Internals
|
||||||
bool toxSaveEventHandler(const QByteArray& eventData);
|
bool toxSaveEventHandler(const QByteArray& eventData);
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -17,10 +17,9 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef QTOX_PLATFORM_EXT
|
#pragma once
|
||||||
|
|
||||||
#ifndef PLATFORM_AUTORUN_H
|
#ifdef QTOX_PLATFORM_EXT
|
||||||
#define PLATFORM_AUTORUN_H
|
|
||||||
|
|
||||||
|
|
||||||
namespace Platform {
|
namespace Platform {
|
||||||
|
@ -28,6 +27,4 @@ bool setAutorun(bool on);
|
||||||
bool getAutorun();
|
bool getAutorun();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // PLATFORM_AUTORUN_H
|
|
||||||
|
|
||||||
#endif // QTOX_PLATFORM_EXT
|
#endif // QTOX_PLATFORM_EXT
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#ifndef AVFOUNDATION_H
|
#pragma once
|
||||||
#define AVFOUNDATION_H
|
|
||||||
|
|
||||||
#include "src/video/videomode.h"
|
#include "src/video/videomode.h"
|
||||||
#include <QPair>
|
#include <QPair>
|
||||||
|
@ -34,5 +33,3 @@ const QString CAPTURE_SCREEN{"Capture screen"};
|
||||||
QVector<VideoMode> getDeviceModes(QString devName);
|
QVector<VideoMode> getDeviceModes(QString devName);
|
||||||
QVector<QPair<QString, QString>> getDeviceList();
|
QVector<QPair<QString, QString>> getDeviceList();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // AVFOUNDATION_H
|
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef DIRECTSHOW_H
|
#pragma once
|
||||||
#define DIRECTSHOW_H
|
|
||||||
|
|
||||||
#include "src/video/videomode.h"
|
#include "src/video/videomode.h"
|
||||||
#include <QPair>
|
#include <QPair>
|
||||||
|
@ -34,5 +33,3 @@ namespace DirectShow {
|
||||||
QVector<QPair<QString, QString>> getDeviceList();
|
QVector<QPair<QString, QString>> getDeviceList();
|
||||||
QVector<VideoMode> getDeviceModes(QString devName);
|
QVector<VideoMode> getDeviceModes(QString devName);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // DIRECTSHOW_H
|
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#ifndef V4L2_H
|
#pragma once
|
||||||
#define V4L2_H
|
|
||||||
|
|
||||||
#include "src/video/videomode.h"
|
#include "src/video/videomode.h"
|
||||||
#include <QPair>
|
#include <QPair>
|
||||||
|
@ -34,5 +33,3 @@ QVector<QPair<QString, QString>> getDeviceList();
|
||||||
QString getPixelFormatString(uint32_t pixel_format);
|
QString getPixelFormatString(uint32_t pixel_format);
|
||||||
bool betterPixelFormat(uint32_t a, uint32_t b);
|
bool betterPixelFormat(uint32_t a, uint32_t b);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // V4L2_H
|
|
||||||
|
|
|
@ -17,16 +17,13 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef QTOX_PLATFORM_EXT
|
#pragma once
|
||||||
|
|
||||||
#ifndef PLATFORM_CAPSLOCK_H
|
#ifdef QTOX_PLATFORM_EXT
|
||||||
#define PLATFORM_CAPSLOCK_H
|
|
||||||
|
|
||||||
|
|
||||||
namespace Platform {
|
namespace Platform {
|
||||||
bool capsLockEnabled();
|
bool capsLockEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // PLATFORM_CAPSLOCK_H
|
|
||||||
|
|
||||||
#endif // QTOX_PLATFORM_EXT
|
#endif // QTOX_PLATFORM_EXT
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef DESKTOPNOTIFY_H
|
#pragma once
|
||||||
#define DESKTOPNOTIFY_H
|
|
||||||
|
|
||||||
#if DESKTOP_NOTIFICATIONS
|
#if DESKTOP_NOTIFICATIONS
|
||||||
#include <libsnore/snore.h>
|
#include <libsnore/snore.h>
|
||||||
|
@ -54,5 +53,3 @@ private:
|
||||||
Snore::Icon snoreIcon;
|
Snore::Icon snoreIcon;
|
||||||
};
|
};
|
||||||
#endif // DESKTOP_NOTIFICATIONS
|
#endif // DESKTOP_NOTIFICATIONS
|
||||||
|
|
||||||
#endif // DESKTOPNOTIFY_H
|
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#ifndef INSTALLOSX_H
|
#pragma once
|
||||||
#define INSTALLOSX_H
|
|
||||||
|
|
||||||
#include <QtCore/qsystemdetection.h>
|
#include <QtCore/qsystemdetection.h>
|
||||||
|
|
||||||
|
@ -33,5 +32,3 @@ static constexpr int EXIT_UPDATE_MACX_FAIL = 216;
|
||||||
void moveToAppFolder();
|
void moveToAppFolder();
|
||||||
void migrateProfiles();
|
void migrateProfiles();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // INSTALLOSX_H
|
|
||||||
|
|
|
@ -17,8 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef POSIXSIGNALNOTIFIER_H
|
#pragma once
|
||||||
#define POSIXSIGNALNOTIFIER_H
|
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
|
@ -49,5 +48,3 @@ private:
|
||||||
private:
|
private:
|
||||||
QSocketNotifier* notifier{nullptr};
|
QSocketNotifier* notifier{nullptr};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // POSIXSIGNALNOTIFIER_H
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user