mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
commit
1bd5e94edd
|
@ -38,8 +38,8 @@ public:
|
||||||
qreal getAscent() const override;
|
qreal getAscent() const override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QSize size;
|
|
||||||
QPixmap pmap;
|
QPixmap pmap;
|
||||||
|
QSize size;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // BROKEN_H
|
#endif // BROKEN_H
|
||||||
|
|
|
@ -86,8 +86,6 @@ FileTransferWidget::FileTransferWidget(QWidget* parent, ToxFile file)
|
||||||
update();
|
update();
|
||||||
});
|
});
|
||||||
|
|
||||||
CoreFile* coreFile = Core::getInstance()->getCoreFile();
|
|
||||||
|
|
||||||
connect(ui->leftButton, &QPushButton::clicked, this, &FileTransferWidget::onLeftButtonClicked);
|
connect(ui->leftButton, &QPushButton::clicked, this, &FileTransferWidget::onLeftButtonClicked);
|
||||||
connect(ui->rightButton, &QPushButton::clicked, this, &FileTransferWidget::onRightButtonClicked);
|
connect(ui->rightButton, &QPushButton::clicked, this, &FileTransferWidget::onRightButtonClicked);
|
||||||
connect(ui->previewButton, &QPushButton::clicked, this,
|
connect(ui->previewButton, &QPushButton::clicked, this,
|
||||||
|
|
|
@ -805,7 +805,7 @@ void Core::bootstrapDht()
|
||||||
QString dhtServerAddress = dhtServer.address.toLatin1();
|
QString dhtServerAddress = dhtServer.address.toLatin1();
|
||||||
QString port = QString::number(dhtServer.port);
|
QString port = QString::number(dhtServer.port);
|
||||||
QString name = dhtServer.name;
|
QString name = dhtServer.name;
|
||||||
qDebug() << QString("Connecting to a bootstrap node...");
|
qDebug("Connecting to bootstrap node %d", j % listSize);
|
||||||
QByteArray address = dhtServer.address.toLatin1();
|
QByteArray address = dhtServer.address.toLatin1();
|
||||||
// TODO: constucting the pk via ToxId is a workaround
|
// TODO: constucting the pk via ToxId is a workaround
|
||||||
ToxPk pk = ToxId{dhtServer.userId}.getPublicKey();
|
ToxPk pk = ToxId{dhtServer.userId}.getPublicKey();
|
||||||
|
@ -1651,7 +1651,7 @@ bool Core::hasFriendWithPublicKey(const ToxPk& publicKey) const
|
||||||
}
|
}
|
||||||
|
|
||||||
Tox_Err_Friend_By_Public_Key error;
|
Tox_Err_Friend_By_Public_Key error;
|
||||||
uint32_t friendId = tox_friend_by_public_key(tox.get(), publicKey.getData(), &error);
|
(void)tox_friend_by_public_key(tox.get(), publicKey.getData(), &error);
|
||||||
return PARSE_ERR(error);
|
return PARSE_ERR(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,10 @@
|
||||||
|
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <random>
|
#include <random>
|
||||||
#include <unistd.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#ifndef _MSC_VER
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,13 +34,13 @@ static const int MAX_GROUP_TITLE_LENGTH = 128;
|
||||||
|
|
||||||
Group::Group(int groupId, const GroupId persistentGroupId, const QString& name, bool isAvGroupchat,
|
Group::Group(int groupId, const GroupId persistentGroupId, const QString& name, bool isAvGroupchat,
|
||||||
const QString& selfName, ICoreGroupQuery& groupQuery, ICoreIdHandler& idHandler)
|
const QString& selfName, ICoreGroupQuery& groupQuery, ICoreIdHandler& idHandler)
|
||||||
: selfName{selfName}
|
: groupQuery(groupQuery)
|
||||||
|
, idHandler(idHandler)
|
||||||
|
, selfName{selfName}
|
||||||
, title{name}
|
, title{name}
|
||||||
, toxGroupNum(groupId)
|
, toxGroupNum(groupId)
|
||||||
, groupId{persistentGroupId}
|
, groupId{persistentGroupId}
|
||||||
, avGroupchat{isAvGroupchat}
|
, avGroupchat{isAvGroupchat}
|
||||||
, groupQuery(groupQuery)
|
|
||||||
, idHandler(idHandler)
|
|
||||||
{
|
{
|
||||||
// in groupchats, we only notify on messages containing your name <-- dumb
|
// in groupchats, we only notify on messages containing your name <-- dumb
|
||||||
// sound notifications should be on all messages, but system popup notification
|
// sound notifications should be on all messages, but system popup notification
|
||||||
|
|
|
@ -108,7 +108,7 @@ public:
|
||||||
inline void disableMentions()
|
inline void disableMentions()
|
||||||
{
|
{
|
||||||
detectingMentions = false;
|
detectingMentions = false;
|
||||||
};
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool detectingMentions = false;
|
bool detectingMentions = false;
|
||||||
|
|
|
@ -185,7 +185,7 @@ QList<DhtServer> BootstrapNodeUpdater::jsonToNodeList(const QJsonDocument& nodeL
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
QJsonArray nodes = rootObj[jsonNodeArrayName].toArray();
|
QJsonArray nodes = rootObj[jsonNodeArrayName].toArray();
|
||||||
for (const auto& node : nodes) {
|
for (const QJsonValueRef node : nodes) {
|
||||||
if (node.isObject()) {
|
if (node.isObject()) {
|
||||||
jsonNodeToDhtServer(node.toObject(), result);
|
jsonNodeToDhtServer(node.toObject(), result);
|
||||||
}
|
}
|
||||||
|
|
|
@ -300,9 +300,6 @@ MessageState getMessageState(bool isPending, bool isBroken)
|
||||||
* Caches mappings to speed up message saving.
|
* Caches mappings to speed up message saving.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static constexpr int NUM_MESSAGES_DEFAULT =
|
|
||||||
100; // arbitrary number of messages loaded when not loading by date
|
|
||||||
|
|
||||||
FileDbInsertionData::FileDbInsertionData()
|
FileDbInsertionData::FileDbInsertionData()
|
||||||
{
|
{
|
||||||
static int id = qRegisterMetaType<FileDbInsertionData>();
|
static int id = qRegisterMetaType<FileDbInsertionData>();
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
|
|
||||||
int state;
|
static int state;
|
||||||
|
|
||||||
bool Platform::setAutorun(bool on)
|
bool Platform::setAutorun(bool on)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,7 @@ QVector<QPair<QString, QString> > avfoundation::getDeviceList()
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t numScreens = 0;
|
uint32_t numScreens = 0;
|
||||||
CGGetActiveDisplayList(0, NULL, &numScreens);
|
CGGetActiveDisplayList(0, nullptr, &numScreens);
|
||||||
if (numScreens > 0) {
|
if (numScreens > 0) {
|
||||||
CGDirectDisplayID screens[numScreens];
|
CGDirectDisplayID screens[numScreens];
|
||||||
CGGetActiveDisplayList(numScreens, screens, &numScreens);
|
CGGetActiveDisplayList(numScreens, screens, &numScreens);
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if DESKTOP_NOTIFICATIONS
|
||||||
#include "desktopnotify.h"
|
#include "desktopnotify.h"
|
||||||
|
|
||||||
#include <src/persistence/settings.h>
|
#include <src/persistence/settings.h>
|
||||||
|
@ -75,3 +76,4 @@ void DesktopNotify::notifyMessageSimple(const MessageType type)
|
||||||
|
|
||||||
createNotification(message, {}, snoreIcon);
|
createNotification(message, {}, snoreIcon);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#ifndef DESKTOPNOTIFY_H
|
#ifndef DESKTOPNOTIFY_H
|
||||||
#define DESKTOPNOTIFY_H
|
#define DESKTOPNOTIFY_H
|
||||||
|
|
||||||
|
#if DESKTOP_NOTIFICATIONS
|
||||||
#include <libsnore/snore.h>
|
#include <libsnore/snore.h>
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
@ -52,5 +53,6 @@ private:
|
||||||
Snore::Application snoreApp;
|
Snore::Application snoreApp;
|
||||||
Snore::Icon snoreIcon;
|
Snore::Icon snoreIcon;
|
||||||
};
|
};
|
||||||
|
#endif // DESKTOP_NOTIFICATIONS
|
||||||
|
|
||||||
#endif // DESKTOPNOTIFY_H
|
#endif // DESKTOPNOTIFY_H
|
||||||
|
|
|
@ -1120,9 +1120,9 @@ void GenericChatForm::renderMessages(ChatLogIdx begin, ChatLogIdx end,
|
||||||
if (onCompletion) {
|
if (onCompletion) {
|
||||||
auto connection = std::make_shared<QMetaObject::Connection>();
|
auto connection = std::make_shared<QMetaObject::Connection>();
|
||||||
*connection = connect(chatWidget, &ChatLog::workerTimeoutFinished,
|
*connection = connect(chatWidget, &ChatLog::workerTimeoutFinished,
|
||||||
[onCompletion, connection] {
|
[this, onCompletion, connection] {
|
||||||
onCompletion();
|
onCompletion();
|
||||||
disconnect(*connection);
|
this->disconnect(*connection);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ class QToolButton;
|
||||||
class QVBoxLayout;
|
class QVBoxLayout;
|
||||||
|
|
||||||
class IMessageDispatcher;
|
class IMessageDispatcher;
|
||||||
class Message;
|
struct Message;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class MainWindow;
|
class MainWindow;
|
||||||
|
|
|
@ -33,7 +33,7 @@ class FlowLayout;
|
||||||
class QTimer;
|
class QTimer;
|
||||||
class GroupId;
|
class GroupId;
|
||||||
class IMessageDispatcher;
|
class IMessageDispatcher;
|
||||||
class Message;
|
struct Message;
|
||||||
|
|
||||||
class GroupChatForm : public GenericChatForm
|
class GroupChatForm : public GenericChatForm
|
||||||
{
|
{
|
||||||
|
|
|
@ -89,7 +89,6 @@ void LoadHistoryDialog::enableSearchMode()
|
||||||
|
|
||||||
void LoadHistoryDialog::highlightDates(int year, int month)
|
void LoadHistoryDialog::highlightDates(int year, int month)
|
||||||
{
|
{
|
||||||
History* history = Nexus::getProfile()->getHistory();
|
|
||||||
QDate monthStart(year, month, 1);
|
QDate monthStart(year, month, 1);
|
||||||
QDate monthEnd(year, month + 1, 1);
|
QDate monthEnd(year, month + 1, 1);
|
||||||
|
|
||||||
|
|
|
@ -99,7 +99,6 @@ AVForm::AVForm(IAudioControl& audio, CoreAV* coreAV, CameraSource& camera,
|
||||||
|
|
||||||
eventsInit();
|
eventsInit();
|
||||||
|
|
||||||
QDesktopWidget* desktop = QApplication::desktop();
|
|
||||||
for (QScreen* qScreen : QGuiApplication::screens()) {
|
for (QScreen* qScreen : QGuiApplication::screens()) {
|
||||||
connect(qScreen, &QScreen::geometryChanged, this, &AVForm::rescanDevices);
|
connect(qScreen, &QScreen::geometryChanged, this, &AVForm::rescanDevices);
|
||||||
}
|
}
|
||||||
|
@ -308,7 +307,7 @@ void AVForm::fillCameraModesComboBox()
|
||||||
|
|
||||||
QString str;
|
QString str;
|
||||||
std::string pixelFormat = CameraDevice::getPixelFormatString(mode.pixel_format).toStdString();
|
std::string pixelFormat = CameraDevice::getPixelFormatString(mode.pixel_format).toStdString();
|
||||||
qDebug("width: %d, height: %d, FPS: %f, pixel format: %s\n", mode.width, mode.height,
|
qDebug("width: %d, height: %d, FPS: %f, pixel format: %s", mode.width, mode.height,
|
||||||
mode.FPS, pixelFormat.c_str());
|
mode.FPS, pixelFormat.c_str());
|
||||||
|
|
||||||
if (mode.height && mode.width) {
|
if (mode.height && mode.width) {
|
||||||
|
|
|
@ -124,7 +124,7 @@ void FriendWidget::onContextMenuCalled(QContextMenuEvent* event)
|
||||||
connect(newGroupAction, &QAction::triggered, chatroom.get(), &FriendChatroom::inviteToNewGroup);
|
connect(newGroupAction, &QAction::triggered, chatroom.get(), &FriendChatroom::inviteToNewGroup);
|
||||||
inviteMenu->addSeparator();
|
inviteMenu->addSeparator();
|
||||||
|
|
||||||
for (const auto group : chatroom->getGroups()) {
|
for (const auto& group : chatroom->getGroups()) {
|
||||||
const auto groupAction = inviteMenu->addAction(tr("Invite to group '%1'").arg(group.name));
|
const auto groupAction = inviteMenu->addAction(tr("Invite to group '%1'").arg(group.name));
|
||||||
connect(groupAction, &QAction::triggered, [=]() { chatroom->inviteFriend(group.group); });
|
connect(groupAction, &QAction::triggered, [=]() { chatroom->inviteFriend(group.group); });
|
||||||
}
|
}
|
||||||
|
@ -145,7 +145,7 @@ void FriendWidget::onContextMenuCalled(QContextMenuEvent* event)
|
||||||
|
|
||||||
circleMenu->addSeparator();
|
circleMenu->addSeparator();
|
||||||
|
|
||||||
for (const auto circle : chatroom->getOtherCircles()) {
|
for (const auto& circle : chatroom->getOtherCircles()) {
|
||||||
QAction* action = new QAction(tr("Move to circle \"%1\"").arg(circle.name), circleMenu);
|
QAction* action = new QAction(tr("Move to circle \"%1\"").arg(circle.name), circleMenu);
|
||||||
connect(action, &QAction::triggered, [=]() { moveToCircle(circle.circleId); });
|
connect(action, &QAction::triggered, [=]() { moveToCircle(circle.circleId); });
|
||||||
circleMenu->addAction(action);
|
circleMenu->addAction(action);
|
||||||
|
|
|
@ -89,7 +89,7 @@ static QMap<QString, QString> dictColor;
|
||||||
static QMap<QString, QString> dictFont;
|
static QMap<QString, QString> dictFont;
|
||||||
static QMap<QString, QString> dictTheme;
|
static QMap<QString, QString> dictTheme;
|
||||||
|
|
||||||
QList<Style::ThemeNameColor> Style::themeNameColors = {
|
static const QList<Style::ThemeNameColor> themeNameColors = {
|
||||||
{Style::Light, QObject::tr("Default"), QColor()},
|
{Style::Light, QObject::tr("Default"), QColor()},
|
||||||
{Style::Light, QObject::tr("Blue"), QColor("#004aa4")},
|
{Style::Light, QObject::tr("Blue"), QColor("#004aa4")},
|
||||||
{Style::Light, QObject::tr("Olive"), QColor("#97ba00")},
|
{Style::Light, QObject::tr("Olive"), QColor("#97ba00")},
|
||||||
|
@ -136,28 +136,30 @@ QString Style::getThemeFolder()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
QMap<Style::ColorPalette, QString> Style::aliasColors = {{TransferGood, "transferGood"},
|
static const QMap<Style::ColorPalette, QString> aliasColors = {
|
||||||
{TransferWait, "transferWait"},
|
{Style::TransferGood, "transferGood"},
|
||||||
{TransferBad, "transferBad"},
|
{Style::TransferWait, "transferWait"},
|
||||||
{TransferMiddle, "transferMiddle"},
|
{Style::TransferBad, "transferBad"},
|
||||||
{MainText,"mainText"},
|
{Style::TransferMiddle, "transferMiddle"},
|
||||||
{NameActive, "nameActive"},
|
{Style::MainText,"mainText"},
|
||||||
{StatusActive,"statusActive"},
|
{Style::NameActive, "nameActive"},
|
||||||
{GroundExtra, "groundExtra"},
|
{Style::StatusActive,"statusActive"},
|
||||||
{GroundBase, "groundBase"},
|
{Style::GroundExtra, "groundExtra"},
|
||||||
{Orange, "orange"},
|
{Style::GroundBase, "groundBase"},
|
||||||
{ThemeDark, "themeDark"},
|
{Style::Orange, "orange"},
|
||||||
{ThemeMediumDark, "themeMediumDark"},
|
{Style::ThemeDark, "themeDark"},
|
||||||
{ThemeMedium, "themeMedium"},
|
{Style::ThemeMediumDark, "themeMediumDark"},
|
||||||
{ThemeLight, "themeLight"},
|
{Style::ThemeMedium, "themeMedium"},
|
||||||
{Action, "action"},
|
{Style::ThemeLight, "themeLight"},
|
||||||
{Link, "link"},
|
{Style::Action, "action"},
|
||||||
{SearchHighlighted, "searchHighlighted"},
|
{Style::Link, "link"},
|
||||||
{SelectText, "selectText"}};
|
{Style::SearchHighlighted, "searchHighlighted"},
|
||||||
|
{Style::SelectText, "selectText"},
|
||||||
|
};
|
||||||
|
|
||||||
// stylesheet filename, font -> stylesheet
|
// stylesheet filename, font -> stylesheet
|
||||||
// QString implicit sharing deduplicates stylesheets rather than constructing a new one each time
|
// QString implicit sharing deduplicates stylesheets rather than constructing a new one each time
|
||||||
std::map<std::pair<const QString, const QFont>, const QString> Style::stylesheetsCache;
|
static std::map<std::pair<const QString, const QFont>, const QString> stylesheetsCache;
|
||||||
|
|
||||||
const QString Style::getStylesheet(const QString& filename, const QFont& baseFont)
|
const QString Style::getStylesheet(const QString& filename, const QFont& baseFont)
|
||||||
{
|
{
|
||||||
|
|
|
@ -96,11 +96,6 @@ signals:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Style();
|
Style();
|
||||||
|
|
||||||
private:
|
|
||||||
static QList<ThemeNameColor> themeNameColors;
|
|
||||||
static std::map<std::pair<const QString, const QFont>, const QString> stylesheetsCache;
|
|
||||||
static QMap<ColorPalette, QString> aliasColors;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // STYLE_H
|
#endif // STYLE_H
|
||||||
|
|
|
@ -361,7 +361,7 @@ void Widget::init()
|
||||||
|
|
||||||
fileMenu->menu()->addSeparator();
|
fileMenu->menu()->addSeparator();
|
||||||
logoutAction = fileMenu->menu()->addAction(QString());
|
logoutAction = fileMenu->menu()->addAction(QString());
|
||||||
connect(logoutAction, &QAction::triggered, [this]() { Nexus::getInstance().showLogin(); });
|
connect(logoutAction, &QAction::triggered, []() { Nexus::getInstance().showLogin(); });
|
||||||
|
|
||||||
editMenu = globalMenu->insertMenu(viewMenu, new QMenu(this));
|
editMenu = globalMenu->insertMenu(viewMenu, new QMenu(this));
|
||||||
editMenu->menu()->addSeparator();
|
editMenu->menu()->addSeparator();
|
||||||
|
@ -1395,7 +1395,6 @@ void Widget::onReceiptReceived(int friendId, ReceiptNum receipt)
|
||||||
|
|
||||||
void Widget::addFriendDialog(const Friend* frnd, ContentDialog* dialog)
|
void Widget::addFriendDialog(const Friend* frnd, ContentDialog* dialog)
|
||||||
{
|
{
|
||||||
uint32_t friendId = frnd->getId();
|
|
||||||
const ToxPk& friendPk = frnd->getPublicKey();
|
const ToxPk& friendPk = frnd->getPublicKey();
|
||||||
ContentDialog* contentDialog = ContentDialogManager::getInstance()->getFriendDialog(friendPk);
|
ContentDialog* contentDialog = ContentDialogManager::getInstance()->getFriendDialog(friendPk);
|
||||||
bool isSeparate = settings.getSeparateWindow();
|
bool isSeparate = settings.getSeparateWindow();
|
||||||
|
@ -1959,8 +1958,7 @@ void Widget::onGroupMessageReceived(int groupnumber, int peernumber, const QStri
|
||||||
bool isAction)
|
bool isAction)
|
||||||
{
|
{
|
||||||
const GroupId& groupId = GroupList::id2Key(groupnumber);
|
const GroupId& groupId = GroupList::id2Key(groupnumber);
|
||||||
Group* g = GroupList::findGroup(groupId);
|
assert(GroupList::findGroup(groupId));
|
||||||
assert(g);
|
|
||||||
|
|
||||||
ToxPk author = core->getGroupPeerPk(groupnumber, peernumber);
|
ToxPk author = core->getGroupPeerPk(groupnumber, peernumber);
|
||||||
|
|
||||||
|
@ -2011,8 +2009,7 @@ void Widget::titleChangedByUser(const QString& title)
|
||||||
void Widget::onGroupPeerAudioPlaying(int groupnumber, ToxPk peerPk)
|
void Widget::onGroupPeerAudioPlaying(int groupnumber, ToxPk peerPk)
|
||||||
{
|
{
|
||||||
const GroupId& groupId = GroupList::id2Key(groupnumber);
|
const GroupId& groupId = GroupList::id2Key(groupnumber);
|
||||||
Group* g = GroupList::findGroup(groupId);
|
assert(GroupList::findGroup(groupId));
|
||||||
assert(g);
|
|
||||||
|
|
||||||
auto form = groupChatForms[groupId].data();
|
auto form = groupChatForms[groupId].data();
|
||||||
form->peerAudioPlaying(peerPk);
|
form->peerAudioPlaying(peerPk);
|
||||||
|
@ -2313,8 +2310,7 @@ void Widget::setStatusBusy()
|
||||||
void Widget::onGroupSendFailed(uint32_t groupnumber)
|
void Widget::onGroupSendFailed(uint32_t groupnumber)
|
||||||
{
|
{
|
||||||
const auto& groupId = GroupList::id2Key(groupnumber);
|
const auto& groupId = GroupList::id2Key(groupnumber);
|
||||||
Group* g = GroupList::findGroup(groupId);
|
assert(GroupList::findGroup(groupId));
|
||||||
assert(g);
|
|
||||||
|
|
||||||
const auto message = tr("Message failed to send");
|
const auto message = tr("Message failed to send");
|
||||||
const auto curTime = QDateTime::currentDateTime();
|
const auto curTime = QDateTime::currentDateTime();
|
||||||
|
|
|
@ -106,7 +106,7 @@ void TestCore::startup_without_proxy()
|
||||||
|
|
||||||
test_core = Core::makeToxCore(savedata, settings, err);
|
test_core = Core::makeToxCore(savedata, settings, err);
|
||||||
|
|
||||||
if(test_core == nullptr) {
|
if (test_core == nullptr) {
|
||||||
QFAIL("ToxCore initialisation failed");
|
QFAIL("ToxCore initialisation failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,7 +132,7 @@ void TestCore::startup_with_invalid_proxy()
|
||||||
|
|
||||||
test_core = Core::makeToxCore(savedata, settings, err);
|
test_core = Core::makeToxCore(savedata, settings, err);
|
||||||
|
|
||||||
if(test_core != nullptr) {
|
if (test_core != nullptr) {
|
||||||
QFAIL("ToxCore initialisation passed with invalid SOCKS5 proxy address");
|
QFAIL("ToxCore initialisation passed with invalid SOCKS5 proxy address");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@ void TestCore::startup_with_invalid_proxy()
|
||||||
|
|
||||||
test_core = Core::makeToxCore(savedata, settings, err);
|
test_core = Core::makeToxCore(savedata, settings, err);
|
||||||
|
|
||||||
if(test_core != nullptr) {
|
if (test_core != nullptr) {
|
||||||
QFAIL("ToxCore initialisation passed with invalid HTTP proxy address");
|
QFAIL("ToxCore initialisation passed with invalid HTTP proxy address");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ class TestMessageProcessor : public QObject
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TestMessageProcessor(){};
|
TestMessageProcessor(){}
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void testSelfMention();
|
void testSelfMention();
|
||||||
|
|
|
@ -61,7 +61,7 @@ class TestSessionChatLog : public QObject
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TestSessionChatLog(){};
|
TestSessionChatLog(){}
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void init();
|
void init();
|
||||||
|
|
|
@ -29,7 +29,7 @@ struct MockFriendMessageSender : public QObject, public ICoreFriendMessageSender
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
MockFriendMessageSender(Friend* f)
|
MockFriendMessageSender(Friend* f)
|
||||||
: f(f){};
|
: f(f){}
|
||||||
bool sendAction(uint32_t friendId, const QString& action, ReceiptNum& receipt) override
|
bool sendAction(uint32_t friendId, const QString& action, ReceiptNum& receipt) override
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user