mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Fiw New Warnings
This commit is contained in:
parent
91f2cf720f
commit
e4dbc46b34
@ -179,7 +179,7 @@ int p3FileDatabase::tick()
|
||||
#endif
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -200,7 +200,7 @@ void AWidget::switchState()
|
||||
|
||||
}
|
||||
|
||||
void AWidget::resizeEvent(QResizeEvent *e)
|
||||
void AWidget::resizeEvent(QResizeEvent */*e*/)
|
||||
{
|
||||
mImagesReady = false ;
|
||||
}
|
||||
@ -289,12 +289,14 @@ void AWidget::drawBitField()
|
||||
for(int i=0;i<bw;++i)
|
||||
for(int j=0;j<bh;++j)
|
||||
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)));
|
||||
else
|
||||
p.fillRect(QRect(i*s,j*s,s,s),QBrush(QColor(50,50,50)));
|
||||
}
|
||||
|
||||
p.end();
|
||||
p.end() ;
|
||||
}
|
||||
|
||||
AWidget::AWidget() {
|
||||
|
@ -771,7 +771,7 @@ void MainWindow::updateFriends()
|
||||
if (sysTrayStatus) sysTrayStatus->setIcon(icon);
|
||||
}
|
||||
|
||||
void MainWindow::postModDirectories(bool update_local)
|
||||
void MainWindow::postModDirectories(bool /*update_local*/)
|
||||
{
|
||||
//RSettingsPage::postModDirectories(update_local);
|
||||
|
||||
|
@ -27,13 +27,14 @@
|
||||
class StyledElidedLabel : public ElidedLabel
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(int fontSizeFactor WRITE setFontSizeFactor)
|
||||
Q_PROPERTY(int fontSizeFactor READ fontSizeFactor WRITE setFontSizeFactor)
|
||||
|
||||
public:
|
||||
StyledElidedLabel(QWidget *parent = NULL);
|
||||
StyledElidedLabel(const QString &text, QWidget *parent = NULL);
|
||||
|
||||
void setFontSizeFactor(int factor);
|
||||
int fontSizeFactor() {return _lastFactor;}
|
||||
|
||||
private:
|
||||
int _lastFactor;
|
||||
|
@ -13,9 +13,9 @@
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<layout class="QVBoxLayout" name="FriendRecommendDialogVLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
||||
<layout class="QHBoxLayout" name="mainHLayout">
|
||||
<item>
|
||||
<widget class="FriendSelectionWidget" name="frec_recommendList" native="true">
|
||||
<property name="sizePolicy">
|
||||
@ -69,8 +69,6 @@
|
||||
<zorder>buttonBox</zorder>
|
||||
<zorder>frec_label</zorder>
|
||||
<zorder>frec_messageEdit</zorder>
|
||||
<zorder>layoutWidget</zorder>
|
||||
<zorder>frec_recommendList</zorder>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
|
@ -2770,7 +2770,7 @@ QString MessageComposer::inviteMessage()
|
||||
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 */
|
||||
MessageComposer *composer = MessageComposer::newMsg();
|
||||
|
@ -117,12 +117,12 @@ void AppearancePage::switch_status(MainWindow::StatusElement s,const QString& ke
|
||||
{
|
||||
MainWindow *pMainWindow = MainWindow::getInstance();
|
||||
|
||||
if(!pMainWindow)
|
||||
return ;
|
||||
if (!pMainWindow)
|
||||
return;
|
||||
|
||||
Settings->setValueToGroup("StatusBar", key, QVariant(b));
|
||||
|
||||
pMainWindow->switchVisibilityStatus(s,b) ;
|
||||
pMainWindow->switchVisibilityStatus(s,b);
|
||||
}
|
||||
|
||||
void AppearancePage::updateLanguageCode() { Settings->setLanguageCode(LanguageSupport::languageCode(ui.cmboLanguage->currentText())); }
|
||||
|
@ -35,8 +35,6 @@
|
||||
<layout class="QGridLayout" name="tabNetConfGLayout">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="netConfHLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
@ -47,7 +45,7 @@
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QVBoxLayout">
|
||||
<layout class="QVBoxLayout" name="netConfLabelVLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_netmode">
|
||||
<property name="text">
|
||||
@ -112,7 +110,7 @@
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QGridLayout">
|
||||
<layout class="QGridLayout" name="netConfValuesVLayout">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
@ -424,8 +422,6 @@
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<layout class="QHBoxLayout" name="ipAddressHLayout">
|
||||
<item>
|
||||
@ -507,7 +503,7 @@ behind a firewall or a VPN.</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<spacer name="verticalSpacer">
|
||||
<spacer name="tabNetConfVSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
@ -524,7 +520,6 @@ behind a firewall or a VPN.</string>
|
||||
<zorder>allowIpDeterminationCB</zorder>
|
||||
<zorder>IPServersLV</zorder>
|
||||
<zorder>ipAddressList</zorder>
|
||||
<zorder>verticalSpacer</zorder>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabIPFilters">
|
||||
<attribute name="title">
|
||||
@ -543,11 +538,11 @@ behind a firewall or a VPN.</string>
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tabWidgetPage1">
|
||||
<widget class="QWidget" name="ipBlackListTabWidget">
|
||||
<attribute name="title">
|
||||
<string>IP blacklist</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<layout class="QVBoxLayout" name="ipBlackListTabWidgetVLayout">
|
||||
<item>
|
||||
<widget class="QTableWidget" name="filteredIpsTable">
|
||||
<property name="contextMenuPolicy">
|
||||
@ -616,7 +611,7 @@ behind a firewall or a VPN.</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_11">
|
||||
<layout class="QHBoxLayout" name="groupIPRangesHLayout">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="groupIPRanges_CB">
|
||||
<property name="toolTip">
|
||||
@ -641,7 +636,7 @@ behind a firewall or a VPN.</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<spacer name="groupIPRangesHSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
@ -657,11 +652,11 @@ behind a firewall or a VPN.</string>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_3">
|
||||
<widget class="QWidget" name="ipWhiteListTabWidget">
|
||||
<attribute name="title">
|
||||
<string>IP whitelist</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<layout class="QGridLayout" name="ipWhiteListTabWidgetGLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QTableWidget" name="whiteListIpsTable">
|
||||
<property name="contextMenuPolicy">
|
||||
@ -780,7 +775,7 @@ behind a firewall or a VPN.</string>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_2">
|
||||
<spacer name="manualInputVSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
|
@ -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
|
||||
if(_instance == NULL) {
|
||||
|
@ -53,7 +53,7 @@ class ConfigPage : public QWidget
|
||||
virtual QString helpText() const = 0;
|
||||
|
||||
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:
|
||||
virtual void showEvent(QShowEvent * /*event*/)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user