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

Fix GCC 4.5 errors, which does not accept any more calling the constructor like

Browse Source 
this: C::C()

For a more detailed and correct explanation see Harald van Dijk's comment here:
http://blog.flameeyes.eu/2010/06/02/tinderbox-summary-for-may-2010-gcc-4-5-berkeley-db-5-0-libpng-1-4


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
leander-256 2010-06-14 11:57:22 +00:00
parent 2d839b031b
commit 4dc30963cb
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/MessengerWindow.cpp
View File

@ -208,7 +208,7 @@ void MessengerWindow::messengertreeWidgetCostumPopupMenu( QPoint point )
hbox->setSpacing(6); hbox->setSpacing(6);
iconLabel = new QLabel( this ); iconLabel = new QLabel( this );
iconLabel->setPixmap(QPixmap::QPixmap(":/images/user/friends24.png")); iconLabel->setPixmap(QPixmap(":/images/user/friends24.png"));
iconLabel->setMaximumSize( iconLabel->frameSize().height() + 24, 24 ); iconLabel->setMaximumSize( iconLabel->frameSize().height() + 24, 24 );
hbox->addWidget(iconLabel); hbox->addWidget(iconLabel);

12
retroshare-gui/src/gui/NetworkDialog.cpp
View File

@ -787,29 +787,29 @@ void NetworkDialog::updateNetworkStatus()
if(config.netUpnpOk) if(config.netUpnpOk)
{ {
ui.iconlabel_upnp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledon1.png"));
} }
else else
{ {
ui.iconlabel_upnp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledoff1.png"));
} }
if (config.netLocalOk) if (config.netLocalOk)
{ {
ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledon1.png"));
} }
else else
{ {
ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledoff1.png"));
} }
if (config.netExtraAddressOk) if (config.netExtraAddressOk)
{ {
ui.iconlabel_ext->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledon1.png"));
} }
else else
{ {
ui.iconlabel_ext->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png"));
} }
rsiface->unlockData(); /* UnLock Interface */ rsiface->unlockData(); /* UnLock Interface */

2
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -364,7 +364,7 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
hbox->setSpacing(6); hbox->setSpacing(6);
iconLabel = new QLabel( this ); iconLabel = new QLabel( this );
iconLabel->setPixmap(QPixmap::QPixmap(":/images/user/friends24.png")); iconLabel->setPixmap(QPixmap(":/images/user/friends24.png"));
iconLabel->setMaximumSize( iconLabel->frameSize().height() + 24, 24 ); iconLabel->setMaximumSize( iconLabel->frameSize().height() + 24, 24 );
hbox->addWidget(iconLabel); hbox->addWidget(iconLabel);

10
retroshare-gui/src/gui/statusbar/natstatus.cpp
View File

@ -47,7 +47,7 @@ NATStatus::NATStatus(QWidget *parent)
hbox->addWidget(statusNAT); hbox->addWidget(statusNAT);
iconLabel = new QLabel( this ); iconLabel = new QLabel( this );
iconLabel->setPixmap(QPixmap::QPixmap(":/images/grayled.png")); iconLabel->setPixmap(QPixmap(":/images/grayled.png"));
// iconLabel doesn't change over time, so we didn't need a minimum size // iconLabel doesn't change over time, so we didn't need a minimum size
hbox->addWidget(iconLabel); hbox->addWidget(iconLabel);
@ -105,22 +105,22 @@ void NATStatus::getNATStatus()
if (config.netUpnpOk) if (config.netUpnpOk)
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png")); iconLabel->setPixmap(QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("OK | RetroShare Server")); iconLabel->setToolTip(tr("OK | RetroShare Server"));
} }
else if (config.netStunOk || config.netExtraAddressOk) else if (config.netStunOk || config.netExtraAddressOk)
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png")); iconLabel->setPixmap(QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("Internet connection")); iconLabel->setToolTip(tr("Internet connection"));
} }
else if (config.netLocalOk) else if (config.netLocalOk)
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/grayled.png")); iconLabel->setPixmap(QPixmap(":/images/grayled.png"));
iconLabel->setToolTip(tr("No internet connection")); iconLabel->setToolTip(tr("No internet connection"));
} }
else else
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/redled.png")); iconLabel->setPixmap(QPixmap(":/images/redled.png"));
iconLabel->setToolTip(tr("No local network")); iconLabel->setToolTip(tr("No local network"));
} }

6
retroshare-gui/src/gui/statusbar/peerstatus.cpp
View File

@ -43,7 +43,7 @@ PeerStatus::PeerStatus(QWidget *parent)
hbox->setSpacing(6); hbox->setSpacing(6);
iconLabel = new QLabel( this ); iconLabel = new QLabel( this );
iconLabel->setPixmap(QPixmap::QPixmap(":/images/user/identitygray16.png")); iconLabel->setPixmap(QPixmap(":/images/user/identitygray16.png"));
// iconLabel doesn't change over time, so we didn't need a minimum size // iconLabel doesn't change over time, so we didn't need a minimum size
hbox->addWidget(iconLabel); hbox->addWidget(iconLabel);
@ -79,11 +79,11 @@ void PeerStatus::getPeerStatus()
if (nOnlineCount > 0) if (nOnlineCount > 0)
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/user/identity16.png")); iconLabel->setPixmap(QPixmap(":/images/user/identity16.png"));
} }
else else
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/user/identitygray16.png")); iconLabel->setPixmap(QPixmap(":/images/user/identitygray16.png"));
} }

10
retroshare-gui/src/gui/statusbar/ratesstatus.cpp
View File

@ -43,7 +43,7 @@ RatesStatus::RatesStatus(QWidget *parent)
hbox->setSpacing(6); hbox->setSpacing(6);
iconLabel = new QLabel( this ); iconLabel = new QLabel( this );
iconLabel->setPixmap(QPixmap::QPixmap(":/images/up0down0.png")); iconLabel->setPixmap(QPixmap(":/images/up0down0.png"));
// iconLabel doesn't change over time, so we didn't need a minimum size // iconLabel doesn't change over time, so we didn't need a minimum size
hbox->addWidget(iconLabel); hbox->addWidget(iconLabel);
@ -78,22 +78,22 @@ void RatesStatus::getRatesStatus()
if( upKb > 0 || downKb < 0 ) if( upKb > 0 || downKb < 0 )
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/up1down0.png")); iconLabel->setPixmap(QPixmap(":/images/up1down0.png"));
} }
if( upKb < 0 || downKb > 0 ) if( upKb < 0 || downKb > 0 )
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/up0down1.png")); iconLabel->setPixmap(QPixmap(":/images/up0down1.png"));
} }
if( upKb > 0 || downKb > 0 ) if( upKb > 0 || downKb > 0 )
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/up1down1.png")); iconLabel->setPixmap(QPixmap(":/images/up1down1.png"));
} }
else else
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/up0down0.png")); iconLabel->setPixmap(QPixmap(":/images/up0down0.png"));
} }