rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#4978 Resolved conflict between interface macro in VS2015

This commit is contained in:
Andrew Nelless 2016-06-23 11:56:06 +01:00 committed by Jerry (Xinyu Hou)
parent 6c58913899
commit 64dbae8918
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/src/AppConfig.h
View File

@ -60,7 +60,7 @@ class AppConfig
public: public:
const QString& screenName() const { return m_ScreenName; } const QString& screenName() const { return m_ScreenName; }
int port() const { return m_Port; } int port() const { return m_Port; }
const QString& interface() const { return m_Interface; } const QString& networkInterface() const { return m_Interface; }
int logLevel() const { return m_LogLevel; } int logLevel() const { return m_LogLevel; }
bool logToFile() const { return m_LogToFile; } bool logToFile() const { return m_LogToFile; }
const QString& logFilename() const { return m_LogFilename; } const QString& logFilename() const { return m_LogFilename; }
@ -103,7 +103,7 @@ class AppConfig
QSettings& settings() { return *m_pSettings; } QSettings& settings() { return *m_pSettings; }
void setScreenName(const QString& s) { m_ScreenName = s; } void setScreenName(const QString& s) { m_ScreenName = s; }
void setPort(int i) { m_Port = i; } void setPort(int i) { m_Port = i; }
void setInterface(const QString& s) { m_Interface = s; } void setNetworkInterface(const QString& s) { m_Interface = s; }
void setLogLevel(int i) { m_LogLevel = i; } void setLogLevel(int i) { m_LogLevel = i; }
void setLogToFile(bool b) { m_LogToFile = b; } void setLogToFile(bool b) { m_LogToFile = b; }
void setLogFilename(const QString& s) { m_LogFilename = s; } void setLogFilename(const QString& s) { m_LogFilename = s; }

2
src/gui/src/MainWindow.cpp
View File

@ -702,7 +702,7 @@ QString MainWindow::configFilename()
QString MainWindow::address() QString MainWindow::address()
{ {
QString i = appConfig().interface(); QString i = appConfig().networkInterface();
return (!i.isEmpty() ? i : "") + ":" + QString::number(appConfig().port()); return (!i.isEmpty() ? i : "") + ":" + QString::number(appConfig().port());
} }

4
src/gui/src/SettingsDialog.cpp
View File

@ -44,7 +44,7 @@ SettingsDialog::SettingsDialog(QWidget* parent, AppConfig& config) :
m_pLineEditScreenName->setText(appConfig().screenName()); m_pLineEditScreenName->setText(appConfig().screenName());
m_pSpinBoxPort->setValue(appConfig().port()); m_pSpinBoxPort->setValue(appConfig().port());
m_pLineEditInterface->setText(appConfig().interface()); m_pLineEditInterface->setText(appConfig().networkInterface());
m_pComboLogLevel->setCurrentIndex(appConfig().logLevel()); m_pComboLogLevel->setCurrentIndex(appConfig().logLevel());
m_pCheckBoxLogToFile->setChecked(appConfig().logToFile()); m_pCheckBoxLogToFile->setChecked(appConfig().logToFile());
m_pLineEditLogFilename->setText(appConfig().logFilename()); m_pLineEditLogFilename->setText(appConfig().logFilename());
@ -74,7 +74,7 @@ void SettingsDialog::accept()
{ {
appConfig().setScreenName(m_pLineEditScreenName->text()); appConfig().setScreenName(m_pLineEditScreenName->text());
appConfig().setPort(m_pSpinBoxPort->value()); appConfig().setPort(m_pSpinBoxPort->value());
appConfig().setInterface(m_pLineEditInterface->text()); appConfig().setNetworkInterface(m_pLineEditInterface->text());
appConfig().setLogLevel(m_pComboLogLevel->currentIndex()); appConfig().setLogLevel(m_pComboLogLevel->currentIndex());
appConfig().setLogToFile(m_pCheckBoxLogToFile->isChecked()); appConfig().setLogToFile(m_pCheckBoxLogToFile->isChecked());
appConfig().setLogFilename(m_pLineEditLogFilename->text()); appConfig().setLogFilename(m_pLineEditLogFilename->text());