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

#6471 Replaced tabs with spaces

This commit is contained in:
Jamie Newbon 2019-04-30 15:40:29 +01:00
parent 7f4ca77444
commit 207247b7ef
No known key found for this signature in database
GPG Key ID: 9618C9BB2FF44DB5
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,11 +66,11 @@ static const int debugLogLevel = 1;
static const char* synergyIconFiles[] = static const char* synergyIconFiles[] =
{ {
":/res/icons/16x16/synergy-disconnected.png", //synergyDisconnected ":/res/icons/16x16/synergy-disconnected.png", //synergyDisconnected
":/res/icons/16x16/synergy-disconnected.png", //synergyConnecting ":/res/icons/16x16/synergy-disconnected.png", //synergyConnecting
":/res/icons/16x16/synergy-connected.png", //synergyConnected ":/res/icons/16x16/synergy-connected.png", //synergyConnected
":/res/icons/16x16/synergy-transfering.png", //synergyListening ":/res/icons/16x16/synergy-transfering.png", //synergyListening
":/res/icons/16x16/synergy-disconnected.png" //synergyPendingRetry ":/res/icons/16x16/synergy-disconnected.png" //synergyPendingRetry
}; };
#ifdef SYNERGY_ENTERPRISE #ifdef SYNERGY_ENTERPRISE
@ -714,12 +714,12 @@ void MainWindow::startSynergy()
void MainWindow::retryStart() void MainWindow::retryStart()
{ {
//This function is only called after a failed start //This function is only called after a failed start
//Only start synergy if the current state is pending retry //Only start synergy if the current state is pending retry
if (m_SynergyState == synergyPendingRetry) if (m_SynergyState == synergyPendingRetry)
{ {
startSynergy(); startSynergy();
} }
} }
void void
@ -946,7 +946,7 @@ void MainWindow::synergyFinished(int exitCode, QProcess::ExitStatus)
if (m_ExpectedRunningState == kStarted) { if (m_ExpectedRunningState == kStarted) {
setSynergyState(synergyPendingRetry); setSynergyState(synergyPendingRetry);
QTimer::singleShot(1000, this, SLOT(retryStart())); QTimer::singleShot(1000, this, SLOT(retryStart()));
appendLogInfo(QString("detected process not running, auto restarting")); appendLogInfo(QString("detected process not running, auto restarting"));
} }
@ -967,7 +967,7 @@ void MainWindow::setSynergyState(qSynergyState state)
if (synergyState() == state) if (synergyState() == state)
return; return;
if ((state == synergyConnected) || (state == synergyConnecting) || (state == synergyListening) || (state == synergyPendingRetry)) if ((state == synergyConnected) || (state == synergyConnecting) || (state == synergyListening) || (state == synergyPendingRetry))
{ {
disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger())); disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger()));
connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger())); connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger()));
@ -1010,9 +1010,9 @@ void MainWindow::setSynergyState(qSynergyState state)
} }
case synergyConnecting: case synergyConnecting:
setStatus(tr("Synergy is starting...")); setStatus(tr("Synergy is starting..."));
break; break;
case synergyPendingRetry: case synergyPendingRetry:
setStatus(tr("There was an error, retrying...")); setStatus(tr("There was an error, retrying..."));
break; break;
case synergyDisconnected: case synergyDisconnected:
setStatus(tr("Synergy is not running")); setStatus(tr("Synergy is not running"));

2
src/lib/platform/XWindowsUtil.cpp
View File

@ -1303,7 +1303,7 @@ XWindowsUtil::getWindowProperty(Display* display, Window window,
int actualDatumSize; int actualDatumSize;
// ignore errors. XGetWindowProperty() will report failure. // ignore errors. XGetWindowProperty() will report failure.
XWindowsUtil::ErrorLock lock(display); // XWindowsUtil::ErrorLock lock(display);
// read the property // read the property
bool okay = true; bool okay = true;