diff options
author | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2011-11-09 03:12:10 +0400 |
---|---|---|
committer | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2011-11-09 03:12:10 +0400 |
commit | 07737a314c20e1669ad87174e5ac5938c9f4ef3d (patch) | |
tree | dd315879a102b2ff43cd66cc1addfb0d25fa883d /src/murmur | |
parent | 37c2e27b8f276abac72c4a05aa5414f3a0fda5bd (diff) |
Fix include guards and PCH includes
Diffstat (limited to 'src/murmur')
-rw-r--r-- | src/murmur/BonjourServer.cpp | 3 | ||||
-rw-r--r-- | src/murmur/BonjourServer.h | 7 | ||||
-rw-r--r-- | src/murmur/Cert.cpp | 4 | ||||
-rw-r--r-- | src/murmur/DBus.cpp | 9 | ||||
-rw-r--r-- | src/murmur/DBus.h | 15 | ||||
-rw-r--r-- | src/murmur/Messages.cpp | 2 | ||||
-rw-r--r-- | src/murmur/Meta.cpp | 9 | ||||
-rw-r--r-- | src/murmur/Meta.h | 14 | ||||
-rw-r--r-- | src/murmur/MurmurIce.cpp | 11 | ||||
-rw-r--r-- | src/murmur/MurmurIce.h | 8 | ||||
-rw-r--r-- | src/murmur/RPC.cpp | 4 | ||||
-rw-r--r-- | src/murmur/Register.cpp | 2 | ||||
-rw-r--r-- | src/murmur/Server.cpp | 15 | ||||
-rw-r--r-- | src/murmur/Server.h | 26 | ||||
-rw-r--r-- | src/murmur/ServerDB.cpp | 13 | ||||
-rw-r--r-- | src/murmur/ServerDB.h | 9 | ||||
-rw-r--r-- | src/murmur/ServerUser.h | 11 | ||||
-rw-r--r-- | src/murmur/Tray.cpp | 5 | ||||
-rw-r--r-- | src/murmur/Tray.h | 6 | ||||
-rw-r--r-- | src/murmur/UnixMurmur.cpp | 2 | ||||
-rw-r--r-- | src/murmur/UnixMurmur.h | 12 |
21 files changed, 125 insertions, 62 deletions
diff --git a/src/murmur/BonjourServer.cpp b/src/murmur/BonjourServer.cpp index de811f0e5..036c98dde 100644 --- a/src/murmur/BonjourServer.cpp +++ b/src/murmur/BonjourServer.cpp @@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "BonjourServer.h" + #include "BonjourServiceRegister.h" BonjourServer::BonjourServer() { diff --git a/src/murmur/BonjourServer.h b/src/murmur/BonjourServer.h index 24259b29f..ca878e86a 100644 --- a/src/murmur/BonjourServer.h +++ b/src/murmur/BonjourServer.h @@ -27,10 +27,11 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _BONJOURSERVER_H -#define _BONJOURSERVER_H -#include "murmur_pch.h" +#ifndef BONJOURSERVER_H_ +#define BONJOURSERVER_H_ + +#include <QtCore/QObject> class BonjourServiceRegister; diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp index 29402acbe..6a47d1be5 100644 --- a/src/murmur/Cert.cpp +++ b/src/murmur/Cert.cpp @@ -28,8 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Server.h" +#include "murmur_pch.h" + #include "Meta.h" +#include "Server.h" #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data() diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp index 413dfe26e..702f34fd7 100644 --- a/src/murmur/DBus.cpp +++ b/src/murmur/DBus.cpp @@ -28,12 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + +#include "DBus.h" + +#include "Connection.h" +#include "Message.h" #include "Server.h" #include "ServerUser.h" #include "ServerDB.h" -#include "Connection.h" -#include "Message.h" -#include "DBus.h" QDBusArgument &operator<<(QDBusArgument &a, const PlayerInfo &s) { a.beginStructure(); diff --git a/src/murmur/DBus.h b/src/murmur/DBus.h index 19becaba8..aaf48277f 100644 --- a/src/murmur/DBus.h +++ b/src/murmur/DBus.h @@ -29,20 +29,23 @@ */ #ifdef USE_DBUS -#ifndef _DBUS_H -#define _DBUS_H +#ifndef DBUS_H_ +#define DBUS_H_ -#include "murmur_pch.h" +#include <QtDBus/QDBusAbstractAdaptor> +#include <QtDBus/QDBusConnection> -#include "User.h" +#include "ACL.h" #include "Channel.h" #include "Group.h" -#include "ACL.h" +#include "Meta.h" #include "Server.h" #include "ServerDB.h" -#include "Meta.h" +#include "User.h" struct Ban; +class QDBusObjectPath; +class QDBusMessage; struct PlayerInfo { unsigned int session; diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp index 8e58ef5ad..77ec78666 100644 --- a/src/murmur/Messages.cpp +++ b/src/murmur/Messages.cpp @@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "User.h" #include "Channel.h" #include "ACL.h" diff --git a/src/murmur/Meta.cpp b/src/murmur/Meta.cpp index 43b28b801..fe7da8b6d 100644 --- a/src/murmur/Meta.cpp +++ b/src/murmur/Meta.cpp @@ -28,11 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "ServerDB.h" -#include "Server.h" +#include "murmur_pch.h" + #include "Meta.h" -#include "Net.h" + #include "DBus.h" +#include "Net.h" +#include "ServerDB.h" +#include "Server.h" #include "OSInfo.h" #include "Version.h" diff --git a/src/murmur/Meta.h b/src/murmur/Meta.h index d485d8e0a..3d6ac7053 100644 --- a/src/murmur/Meta.h +++ b/src/murmur/Meta.h @@ -28,13 +28,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _META_H -#define _META_H +#ifndef META_H_ +#define META_H_ + +#include <QtCore/QDir> +#include <QtCore/QList> +#include <QtCore/QUrl> +#include <QtCore/QVariant> +#include <QtNetwork/QHostAddress> +#include <QtNetwork/QSslCertificate> +#include <QtNetwork/QSslKey> -#include "murmur_pch.h" #include "Timer.h" class Server; +class QSettings; struct MetaParams { QDir qdBasePath; diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index cae3099ba..637dc3d80 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -28,19 +28,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + +#include "MurmurIce.h" #include <Ice/Ice.h> #include <Ice/SliceChecksums.h> #include <IceUtil/IceUtil.h> + +#include "Channel.h" +#include "Group.h" #include "Meta.h" +#include "MurmurI.h" #include "Server.h" #include "ServerUser.h" #include "ServerDB.h" #include "User.h" -#include "Channel.h" -#include "Group.h" -#include "MurmurIce.h" -#include "MurmurI.h" using namespace std; using namespace Murmur; diff --git a/src/murmur/MurmurIce.h b/src/murmur/MurmurIce.h index a1f043304..69ecaf6c0 100644 --- a/src/murmur/MurmurIce.h +++ b/src/murmur/MurmurIce.h @@ -29,13 +29,9 @@ */ #ifdef USE_ICE -#ifndef _MURMURICE_H -#define _MURMURICE_H +#ifndef MURMURICE_H_ +#define MURMURICE_H_ -#include "murmur_pch.h" - -#include <Ice/Ice.h> -#include <IceUtil/IceUtil.h> #include "MurmurI.h" class Channel; diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp index d002778bc..147db352e 100644 --- a/src/murmur/RPC.cpp +++ b/src/murmur/RPC.cpp @@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Server.h" -#include "ServerUser.h" #include "Channel.h" #include "Group.h" #include "Meta.h" +#include "Server.h" #include "ServerDB.h" +#include "ServerUser.h" #include "Version.h" /*! diff --git a/src/murmur/Register.cpp b/src/murmur/Register.cpp index fd2badfbf..1f4e6e2a1 100644 --- a/src/murmur/Register.cpp +++ b/src/murmur/Register.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "Server.h" #include "Meta.h" #include "Version.h" diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index 099822322..ef1f80e78 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -31,18 +31,19 @@ #include "murmur_pch.h" -#include "User.h" -#include "Channel.h" +#include "Server.h" + #include "ACL.h" -#include "Group.h" -#include "Message.h" -#include "ServerDB.h" #include "Connection.h" -#include "Server.h" #include "DBus.h" +#include "Group.h" +#include "User.h" +#include "Channel.h" +#include "Message.h" #include "Meta.h" -#include "PacketDataStream.h" #include "OpusUtilities.h" +#include "PacketDataStream.h" +#include "ServerDB.h" #include "ServerUser.h" #ifdef USE_BONJOUR diff --git a/src/murmur/Server.h b/src/murmur/Server.h index b9d6b2ef4..3b492c2e0 100644 --- a/src/murmur/Server.h +++ b/src/murmur/Server.h @@ -29,14 +29,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SERVER_H -#define _SERVER_H +#ifndef SERVER_H_ +#define SERVER_H_ + +#include <boost/function.hpp> +#include <QtCore/QEvent> +#include <QtCore/QMutex> +#include <QtCore/QTimer> +#include <QtCore/QQueue> +#include <QtCore/QReadWriteLock> +#include <QtCore/QStringList> +#include <QtCore/QSocketNotifier> +#include <QtCore/QThread> +#include <QtCore/QUrl> +#include <QtNetwork/QSslCertificate> +#include <QtNetwork/QSslKey> +#include <QtNetwork/QSslSocket> +#include <QtNetwork/QTcpServer> -#include "murmur_pch.h" +#include "ACL.h" #include "Message.h" -#include "Timer.h" +#include "Mumble.pb.h" #include "Net.h" -#include "ACL.h" +#include "Timer.h" #ifdef USE_BONJOUR #include "BonjourServer.h" @@ -46,6 +61,7 @@ class Channel; class PacketDataStream; class ServerUser; class User; +class QNetworkAccessManager; struct TextMessage { QList<unsigned int> qlSessions; diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp index 207d1bbb8..b60145858 100644 --- a/src/murmur/ServerDB.cpp +++ b/src/murmur/ServerDB.cpp @@ -28,16 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "ServerDB.h" -#include "User.h" + +#include "ACL.h" #include "Channel.h" +#include "Connection.h" +#include "DBus.h" #include "Group.h" -#include "ACL.h" +#include "Meta.h" #include "Server.h" #include "ServerUser.h" -#include "Meta.h" -#include "Connection.h" -#include "DBus.h" +#include "User.h" #define SQLDO(x) ServerDB::exec(query, QLatin1String(x), true) #define SQLMAY(x) ServerDB::exec(query, QLatin1String(x), false, false) diff --git a/src/murmur/ServerDB.h b/src/murmur/ServerDB.h index 4b4776899..56af5aeb5 100644 --- a/src/murmur/ServerDB.h +++ b/src/murmur/ServerDB.h @@ -28,15 +28,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _DATABASE_H -#define _DATABASE_H +#ifndef DATABASE_H_ +#define DATABASE_H_ + +#include <QtCore/QVariant> -#include "murmur_pch.h" #include "Timer.h" class Channel; class User; class Connection; +class QSqlDatabase; +class QSqlQuery; class ServerDB { public: diff --git a/src/murmur/ServerUser.h b/src/murmur/ServerUser.h index 9e03b2112..9ae2ce022 100644 --- a/src/murmur/ServerUser.h +++ b/src/murmur/ServerUser.h @@ -29,14 +29,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SERVERUSER_H -#define _SERVERUSER_H +#ifndef SERVERUSER_H_ +#define SERVERUSER_H_ + +#include <QtCore/QStringList> + +#include <sys/socket.h> -#include "murmur_pch.h" -#include "User.h" #include "Connection.h" #include "Net.h" #include "Timer.h" +#include "User.h" // Unfortunately, this needs to be "large enough" to hold // enough frames to account for both short-term and diff --git a/src/murmur/Tray.cpp b/src/murmur/Tray.cpp index 068ab4955..bb9ff8019 100644 --- a/src/murmur/Tray.cpp +++ b/src/murmur/Tray.cpp @@ -28,9 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "murmur_pch.h" + #include "Tray.h" -#include "Server.h" + #include "Meta.h" +#include "Server.h" #include "Version.h" Tray::Tray(QObject *p, LogEmitter *logger) : QObject(p) { diff --git a/src/murmur/Tray.h b/src/murmur/Tray.h index 145d63938..e6da8d0e0 100644 --- a/src/murmur/Tray.h +++ b/src/murmur/Tray.h @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _TRAY_H -#define _TRAY_H +#ifndef TRAY_H_ +#define TRAY_H_ -#include "murmur_pch.h" +#include <QtCore/QObject> class LogEmitter; diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp index 13b067ea6..adc24f308 100644 --- a/src/murmur/UnixMurmur.cpp +++ b/src/murmur/UnixMurmur.cpp @@ -29,7 +29,9 @@ */ #include "murmur_pch.h" + #include "UnixMurmur.h" + #include "Meta.h" QMutex *LimitTest::qm; diff --git a/src/murmur/UnixMurmur.h b/src/murmur/UnixMurmur.h index bb59a37c9..efd53c3df 100644 --- a/src/murmur/UnixMurmur.h +++ b/src/murmur/UnixMurmur.h @@ -28,10 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _UNIXMURMUR_H -#define _UNIXMURMUR_H +#ifndef UNIXMURMUR_H_ +#define UNIXMURMUR_H_ -#include "murmur_pch.h" +#include <QtCore/QObject> +#include <QtCore/QThread> + +class QCoreApplication; +class QMutex; +class QSocketNotifier; +class QWaitCondition; class LimitTest : public QThread { Q_OBJECT |