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

Fiw New Warnings

Browse source
This commit is contained in:
Phenom 2017-02-27 22:12:48 +01:00
parent 91f2cf720f
commit e4dbc46b34
10 changed files with 374 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/file_sharing/p3filelists.cc
View file

@ -179,7 +179,7 @@ int p3FileDatabase::tick()
#endif #endif
last_print_time = now ; last_print_time = now ;
#warning mr-alice 2016-08-19: This should be removed, but it's necessary atm for updating the GUI #warning mr-alice 2016-08-19: "This should be removed, but it's necessary atm for updating the GUI"
RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_LOCAL, 0); RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_LOCAL, 0);
} }

4
retroshare-gui/src/gui/AboutWidget.cpp
View file

@ -200,7 +200,7 @@ void AWidget::switchState()
} }
void AWidget::resizeEvent(QResizeEvent *e) void AWidget::resizeEvent(QResizeEvent */*e*/)
{ {
mImagesReady = false ; mImagesReady = false ;
} }
@ -289,10 +289,12 @@ void AWidget::drawBitField()
for(int i=0;i<bw;++i) for(int i=0;i<bw;++i)
for(int j=0;j<bh;++j) for(int j=0;j<bh;++j)
if(bitfield1[i+bw*j] == 1) if(bitfield1[i+bw*j] == 1)
{
if (mStep >= mMaxStep) if (mStep >= mMaxStep)
p.fillRect(QRect(i*s+1,j*s+1,s-1,s-1),QBrush(QColor(50,50,50))); p.fillRect(QRect(i*s+1,j*s+1,s-1,s-1),QBrush(QColor(50,50,50)));
else else
p.fillRect(QRect(i*s,j*s,s,s),QBrush(QColor(50,50,50))); p.fillRect(QRect(i*s,j*s,s,s),QBrush(QColor(50,50,50)));
}
p.end() ; p.end() ;
} }

2
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -771,7 +771,7 @@ void MainWindow::updateFriends()
if (sysTrayStatus) sysTrayStatus->setIcon(icon); if (sysTrayStatus) sysTrayStatus->setIcon(icon);
} }
void MainWindow::postModDirectories(bool update_local) void MainWindow::postModDirectories(bool /*update_local*/)
{ {
//RSettingsPage::postModDirectories(update_local); //RSettingsPage::postModDirectories(update_local);

3
retroshare-gui/src/gui/common/StyledElidedLabel.h
View file

@ -27,13 +27,14 @@
class StyledElidedLabel : public ElidedLabel class StyledElidedLabel : public ElidedLabel
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int fontSizeFactor WRITE setFontSizeFactor) Q_PROPERTY(int fontSizeFactor READ fontSizeFactor WRITE setFontSizeFactor)
public: public:
StyledElidedLabel(QWidget *parent = NULL); StyledElidedLabel(QWidget *parent = NULL);
StyledElidedLabel(const QString &text, QWidget *parent = NULL); StyledElidedLabel(const QString &text, QWidget *parent = NULL);
void setFontSizeFactor(int factor); void setFontSizeFactor(int factor);
int fontSizeFactor() {return _lastFactor;}
private: private:
int _lastFactor; int _lastFactor;

6
retroshare-gui/src/gui/connect/FriendRecommendDialog.ui
View file

@ -13,9 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="FriendRecommendDialogVLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="mainHLayout">
<item> <item>
<widget class="FriendSelectionWidget" name="frec_recommendList" native="true"> <widget class="FriendSelectionWidget" name="frec_recommendList" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
@ -69,8 +69,6 @@
<zorder>buttonBox</zorder> <zorder>buttonBox</zorder>
<zorder>frec_label</zorder> <zorder>frec_label</zorder>
<zorder>frec_messageEdit</zorder> <zorder>frec_messageEdit</zorder>
<zorder>layoutWidget</zorder>
<zorder>frec_recommendList</zorder>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>

2
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -2770,7 +2770,7 @@ QString MessageComposer::inviteMessage()
return tr("Hi,<br>I want to be friends with you on RetroShare.<br>"); return tr("Hi,<br>I want to be friends with you on RetroShare.<br>");
} }
void MessageComposer::sendInvite(const RsGxsId &to, const QString &msg, bool autoSend) void MessageComposer::sendInvite(const RsGxsId &to, const QString &/*msg*/, bool autoSend)
{ {
/* create a message */ /* create a message */
MessageComposer *composer = MessageComposer::newMsg(); MessageComposer *composer = MessageComposer::newMsg();

25
retroshare-gui/src/gui/settings/ServerPage.ui
View file

@ -35,8 +35,6 @@
<layout class="QGridLayout" name="tabNetConfGLayout"> <layout class="QGridLayout" name="tabNetConfGLayout">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="netConfHLayout"> <layout class="QHBoxLayout" name="netConfHLayout">
<item>
<layout class="QHBoxLayout">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
@ -47,7 +45,7 @@
<number>6</number> <number>6</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout"> <layout class="QVBoxLayout" name="netConfLabelVLayout">
<item> <item>
<widget class="QLabel" name="label_netmode"> <widget class="QLabel" name="label_netmode">
<property name="text"> <property name="text">
@ -112,7 +110,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QGridLayout"> <layout class="QGridLayout" name="netConfValuesVLayout">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
@ -424,8 +422,6 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout" name="ipAddressHLayout"> <layout class="QHBoxLayout" name="ipAddressHLayout">
<item> <item>
@ -507,7 +503,7 @@ behind a firewall or a VPN.</string>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
<spacer name="verticalSpacer"> <spacer name="tabNetConfVSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -524,7 +520,6 @@ behind a firewall or a VPN.</string>
<zorder>allowIpDeterminationCB</zorder> <zorder>allowIpDeterminationCB</zorder>
<zorder>IPServersLV</zorder> <zorder>IPServersLV</zorder>
<zorder>ipAddressList</zorder> <zorder>ipAddressList</zorder>
<zorder>verticalSpacer</zorder>
</widget> </widget>
<widget class="QWidget" name="tabIPFilters"> <widget class="QWidget" name="tabIPFilters">
<attribute name="title"> <attribute name="title">
@ -543,11 +538,11 @@ behind a firewall or a VPN.</string>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tabWidgetPage1"> <widget class="QWidget" name="ipBlackListTabWidget">
<attribute name="title"> <attribute name="title">
<string>IP blacklist</string> <string>IP blacklist</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="ipBlackListTabWidgetVLayout">
<item> <item>
<widget class="QTableWidget" name="filteredIpsTable"> <widget class="QTableWidget" name="filteredIpsTable">
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
@ -616,7 +611,7 @@ behind a firewall or a VPN.</string>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_11"> <layout class="QHBoxLayout" name="groupIPRangesHLayout">
<item> <item>
<widget class="QCheckBox" name="groupIPRanges_CB"> <widget class="QCheckBox" name="groupIPRanges_CB">
<property name="toolTip"> <property name="toolTip">
@ -641,7 +636,7 @@ behind a firewall or a VPN.</string>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="groupIPRangesHSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -657,11 +652,11 @@ behind a firewall or a VPN.</string>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_3"> <widget class="QWidget" name="ipWhiteListTabWidget">
<attribute name="title"> <attribute name="title">
<string>IP whitelist</string> <string>IP whitelist</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="ipWhiteListTabWidgetGLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTableWidget" name="whiteListIpsTable"> <widget class="QTableWidget" name="whiteListIpsTable">
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
@ -780,7 +775,7 @@ behind a firewall or a VPN.</string>
</layout> </layout>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="manualInputVSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>

2
retroshare-gui/src/gui/settings/rsettingswin.cpp
View file

@ -92,7 +92,7 @@ SettingsPage::~SettingsPage()
// } // }
//} //}
/*static*/ void SettingsPage::showYourself(QWidget *parent, PageType page /* = LastPage*/) /*static*/ void SettingsPage::showYourself(QWidget */*parent*/, PageType /*page = LastPage*/)
{ {
#ifdef TODO #ifdef TODO
if(_instance == NULL) { if(_instance == NULL) {

2
retroshare-gui/src/retroshare-gui/configpage.h
View file

@ -53,7 +53,7 @@ class ConfigPage : public QWidget
virtual QString helpText() const = 0; virtual QString helpText() const = 0;
private: private:
virtual bool save(QString &errmsg) { std::cerr << "(EE) save() shoud not be called!" << std::endl; return true;} virtual bool save(QString &errmsg) { std::cerr << "(EE) save() shoud not be called!" << errmsg.toStdString() << std::endl; return true;}
protected: protected:
virtual void showEvent(QShowEvent * /*event*/) virtual void showEvent(QShowEvent * /*event*/)
{ {