diff options
author | Thorvald Natvig <slicer@users.sourceforge.net> | 2008-03-20 17:26:20 +0300 |
---|---|---|
committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2008-03-20 17:26:20 +0300 |
commit | e93c194397fad82fce2411ad3a193d9f2934fa79 (patch) | |
tree | 673b4d17082a62bdac91755ff55fbc3979bfde9b /src/murmur | |
parent | 0f22bcfbda2641f32cad80f2ee0b860e0621e855 (diff) |
Indenting run
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1019 05730e5d-ab1b-0410-a4ac-84af385074fa
Diffstat (limited to 'src/murmur')
-rw-r--r-- | src/murmur/DBus.cpp | 2 | ||||
-rw-r--r-- | src/murmur/Register.cpp | 6 | ||||
-rw-r--r-- | src/murmur/ServerDB.cpp | 2 | ||||
-rw-r--r-- | src/murmur/UnixMurmur.cpp | 24 | ||||
-rw-r--r-- | src/murmur/UnixMurmur.h | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp index 663591143..0a05bf4f3 100644 --- a/src/murmur/DBus.cpp +++ b/src/murmur/DBus.cpp @@ -1071,7 +1071,7 @@ void MetaDBus::rotateLogs(const QDBusMessage &msg) { } else { qfLog->setTextModeEnabled(true); qWarning("Log rotated successfully"); - } + } } void MetaDBus::quit() { diff --git a/src/murmur/Register.cpp b/src/murmur/Register.cpp index fbbe8baec..d145c631d 100644 --- a/src/murmur/Register.cpp +++ b/src/murmur/Register.cpp @@ -110,12 +110,12 @@ void Server::update() { qssReg = new QSslSocket(this); qssReg->setLocalCertificate(qscCert); qssReg->setPrivateKey(qskKey); - + http = new QHttp(QLatin1String("mumble.hive.no"), QHttp::ConnectionModeHttps, 443, this); http->setSocket(qssReg); connect(http, SIGNAL(done(bool)), this, SLOT(done(bool))); - connect(http, SIGNAL(sslErrors ( const QList<QSslError> &)), this, SLOT(regSslError(const QList<QSslError> &))); + connect(http, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(regSslError(const QList<QSslError> &))); QHttpRequestHeader h(QLatin1String("POST"), QLatin1String("/register.cgi")); h.setValue(QLatin1String("Connection"), QLatin1String("Keep-Alive")); @@ -138,5 +138,5 @@ void Server::done(bool err) { void Server::regSslError(const QList<QSslError> &errs) { foreach(const QSslError &e, errs) - log("Registration: SSL Handshake error: %s", qPrintable(e.errorString())); + log("Registration: SSL Handshake error: %s", qPrintable(e.errorString())); } diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp index f845abce3..b901e4cac 100644 --- a/src/murmur/ServerDB.cpp +++ b/src/murmur/ServerDB.cpp @@ -1188,7 +1188,7 @@ QList<QPair<unsigned int, QString> > ServerDB::getLog(int server_id, unsigned in SQLEXEC(); QList<QPair<unsigned int, QString> > ql; - while(query.next()) { + while (query.next()) { QDateTime qdt = query.value(0).toDateTime(); QString msg = query.value(1).toString(); ql << QPair<unsigned int, QString>(qdt.toTime_t(), msg); diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp index c8a562310..bf78c57e3 100644 --- a/src/murmur/UnixMurmur.cpp +++ b/src/murmur/UnixMurmur.cpp @@ -44,26 +44,26 @@ UnixMurmur::UnixMurmur() { if (::socketpair(AF_UNIX, SOCK_STREAM, 0, iTermFd)) qFatal("Couldn't create TERM socketpair"); - + qsnHup = new QSocketNotifier(iHupFd[1], QSocketNotifier::Read, this); qsnTerm = new QSocketNotifier(iTermFd[1], QSocketNotifier::Read, this); - + connect(qsnHup, SIGNAL(activated(int)), this, SLOT(handleSigHup())); connect(qsnTerm, SIGNAL(activated(int)), this, SLOT(handleSigTerm())); - + struct sigaction hup, term; - + hup.sa_handler = hupSignalHandler; sigemptyset(&hup.sa_mask); hup.sa_flags = SA_RESTART; - + if (sigaction(SIGHUP, &hup, NULL)) qFatal("Failed to install SIGHUP handler"); term.sa_handler = termSignalHandler; sigemptyset(&term.sa_mask); term.sa_flags = SA_RESTART; - + if (sigaction(SIGTERM, &term, NULL)) qFatal("Failed to install SIGTERM handler"); } @@ -71,7 +71,7 @@ UnixMurmur::UnixMurmur() { UnixMurmur::~UnixMurmur() { delete qsnHup; delete qsnTerm; - + qsnHup = NULL; qsnTerm = NULL; @@ -98,9 +98,9 @@ void UnixMurmur::handleSigHup() { qsnHup->setEnabled(false); char tmp; ::read(iHupFd[1], &tmp, sizeof(tmp)); - - if (! qfLog || ! qfLog->isOpen()) { - qWarning("Caught SIGHUP, but logfile not in use"); + + if (! qfLog || ! qfLog->isOpen()) { + qWarning("Caught SIGHUP, but logfile not in use"); } else { qWarning("Caught SIGHUP, will reopen %s", qPrintable(Meta::mp.qsLogfile)); qfLog->close(); @@ -120,10 +120,10 @@ void UnixMurmur::handleSigTerm() { qsnTerm->setEnabled(false); char tmp; ::read(iTermFd[1], &tmp, sizeof(tmp)); - + qWarning("Caught SIGTERM, exiting"); QCoreApplication::instance()->quit(); - + qsnTerm->setEnabled(true); } diff --git a/src/murmur/UnixMurmur.h b/src/murmur/UnixMurmur.h index 5058b67f4..36d2a1a30 100644 --- a/src/murmur/UnixMurmur.h +++ b/src/murmur/UnixMurmur.h @@ -38,7 +38,7 @@ class UnixMurmur : public QObject { protected:
static int iHupFd[2], iTermFd[2];
QSocketNotifier *qsnHup, *qsnTerm;
-
+
static void hupSignalHandler(int);
static void termSignalHandler(int);
public slots:
|