StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'rowenstipe/master'

Browse Source
This commit is contained in:
agilob 2015-10-22 07:12:33 +01:00
commit 8185893ab5
No known key found for this signature in database
GPG Key ID: 296F0B764741106C
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/audio/audio.h
View File

@ -24,6 +24,7 @@
#include <QObject>
#include <QMutexLocker>
#include <atomic>
#include <cmath>
#if defined(__APPLE__) && defined(__MACH__)
#include <OpenAL/al.h>

6
src/persistence/historykeeper.cpp
View File

@ -524,11 +524,7 @@ void HistoryKeeper::removeAvatar(const QString& ownerId)
bool HistoryKeeper::hasAvatar(const QString& ownerId)
{
QSqlQuery sqlAnswer = db->exec(QString("SELECT avatar FROM aliases WHERE user_id= '%1'").arg(ownerId.left(64)));
if (sqlAnswer.first() && sqlAnswer.value(0).toByteArray()!=NULL)
{
return true;
}
return false;
return !sqlAnswer.isNull(0);
}
void HistoryKeeper::saveAvatar(QPixmap& pic, const QString& ownerId)

1
src/widget/tool/movablewidget.cpp
View File

@ -20,6 +20,7 @@
#include "movablewidget.h"
#include <QMouseEvent>
#include <QGraphicsOpacityEffect>
#include <cmath>
MovableWidget::MovableWidget(QWidget *parent)
: QWidget(parent)