Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-10 14:25:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix compilation and some new warnings.

Browse source
This commit is contained in:
Phenom 2016-12-21 21:23:54 +01:00
parent aca36a3e37
commit 40cf76808c
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View file

@ -320,7 +320,7 @@
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QPlainTextEdit" name="friendCertEdit">
<widget class="RSPlainTextEdit" name="friendCertEdit">
<property name="font">
<font>
<family>Courier New</family>
@ -1560,6 +1560,11 @@ resources.</string>
<header>gui/connect/ConnectFriendWizard.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>RSPlainTextEdit</class>
<extends>QPlainTextEdit</extends>
<header>gui/common/RSPlainTextEdit.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>

4
retroshare-gui/src/util/misc.cpp
View file

@ -209,8 +209,8 @@ QString misc::userFriendlyDuration(qlonglong seconds)
QString misc::timeRelativeToNow(uint32_t mtime)
{
if(mtime == 0)
return QString();
if( mtime == 0)
return QString() ;
time_t now = time(NULL) ;
if(mtime > now)