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

Replaced Q_WS_ --> Q_OS_

Browse source 
Q_WS macros are not available in Qt5
Restores some functions in Options->General dialog that were not available under Qt5
This commit is contained in:
hunbernd 2015-08-29 21:31:01 +02:00
parent 0b5b20d5ea
commit acc3e4bb62
16 changed files with 39 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/QuickStartWizard.cpp
View file

@ -66,7 +66,7 @@ QuickStartWizard::QuickStartWizard(QWidget *parent) :
ui.shareddirList->horizontalHeader()->setStretchLastSection(false);
/* Hide platform specific features */
#ifndef Q_WS_WIN
#ifndef Q_OS_WIN
ui.checkBoxRunRetroshareAtSystemStartup->setVisible(false);
ui.chkRunRetroshareAtSystemStartupMinimized->setVisible(false);
#endif
@ -192,7 +192,7 @@ void QuickStartWizard::on_pushButtonSystemFinish_clicked()
{
Settings->setStartMinimized(ui.checkBoxStartMinimized->isChecked());
Settings->setValue("doQuit", ui.checkBoxQuit->isChecked());
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
Settings->setRunRetroshareOnBoot(ui.checkBoxRunRetroshareAtSystemStartup->isChecked(), ui.chkRunRetroshareAtSystemStartupMinimized->isChecked());
#endif
@ -381,7 +381,7 @@ bool QuickStartWizard::messageBoxOk(QString msg)
void
QuickStartWizard::loadGeneral()
{
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
bool minimized;
ui.checkBoxRunRetroshareAtSystemStartup->setChecked(Settings->runRetroshareOnBoot(minimized));
ui.chkRunRetroshareAtSystemStartupMinimized->setChecked(minimized);