Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-05 23:55:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed compilation on debian squeeze. Removed placeHolder properties in CreateGxsForumMsg.ui and GxsGroupDialog.ui which need to be set in the cpp. Added a new DEFINE=NO_SQLCIPHER to compile without sqlcipher when sqlcipher cannot be found (no sqlcipher is available on debian squeeze).

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-02-13 19:34:38 +00:00
parent 0d308ffa2e
commit 6585cfca2c
14 changed files with 75 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

20
retroshare-gui/src/gui/common/RSGraphWidget.cpp
View file

@ -35,11 +35,27 @@
#include <retroshare-gui/RsAutoUpdatePage.h>
#include "RSGraphWidget.h"
#if QT_VERSION < 0x040700
#include <sys/time.h>
static qint64 getCurrentMSecsSinceEpoch()
{
timeval tv ;
gettimeofday(&tv,NULL) ;
return (qint64)tv.tv_sec + (qint64)tv.tv_usec/1000 ;
}
#endif
RSGraphSource::RSGraphSource()
{
_time_limit_msecs = 10*1000 ;
_update_period_msecs = 1*1000 ;
#if QT_VERSION < 0x040700
_time_orig_msecs = getCurrentMSecsSinceEpoch() ;
#else
_time_orig_msecs = QDateTime::currentMSecsSinceEpoch() ;
#endif
_timer = new QTimer ;
_digits = 2 ;
@ -140,7 +156,11 @@ if(_source != NULL)
qint64 RSGraphSource::getTime() const
{
#if QT_VERSION < 0x040700
return getCurrentMSecsSinceEpoch() - _time_orig_msecs ;
#else
return QDateTime::currentMSecsSinceEpoch() - _time_orig_msecs ;
#endif
}
void RSGraphSource::updateIfPossible()