Fix uppercase vs lowercase vs PCH include problems

src/Message.h

@@ -107,6 +107,4 @@ inline QByteArray sha1(const QString &str) {
 	return QCryptographicHash::hash(str.toUtf8(), QCryptographicHash::Sha1);
 }
 
-#else
-class Message;
 #endif

src/SSL.cpp

@@ -30,7 +30,6 @@
 
 #include "SSL.h"
 #include "Version.h"
-#include <QtNetwork>
 
 /* CAs we recommend to end users, so support these */
 

src/Timer.cpp

@@ -28,7 +28,6 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <QtCore>
 #include "Timer.h"
 
 Timer::Timer(bool start) {

src/Timer.h

@@ -31,6 +31,8 @@
 #ifndef _TIMER_H
 #define _TIMER_H
 
+#include "murmur_pch.h"
+
 // All timer resolutions are in microseconds.
 
 class Timer {

src/bonjour/BonjourRecord.h

@@ -29,6 +29,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef BONJOURRECORD_H
 #define BONJOURRECORD_H
 
+#include "murmur_pch.h"
+
 class BonjourRecord {
 	public:
 		BonjourRecord() {}

src/bonjour/BonjourServiceBrowser.cpp

@@ -26,9 +26,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "bonjourservicebrowser.h"
-
-#include <QtCore/QSocketNotifier>
+#include "BonjourServiceBrowser.h"
 
 BonjourServiceBrowser::BonjourServiceBrowser(QObject *parent)
 		: QObject(parent), dnssref(0), bonjourSocket(0) {

src/bonjour/BonjourServiceBrowser.h

@@ -31,9 +31,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define BONJOURSERVICEBROWSER_H
 
 #include <dns_sd.h>
-#include "bonjourrecord.h"
 
-class QSocketNotifier;
+#include "BonjourRecord.h"
+
 class BonjourServiceBrowser : public QObject {
 		Q_OBJECT
 	public:

src/bonjour/BonjourServiceRegister.cpp

@@ -27,8 +27,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "bonjourserviceregister.h"
-#include <QtCore/QSocketNotifier>
+#include "BonjourServiceRegister.h"
 
 BonjourServiceRegister::BonjourServiceRegister(QObject *parent)
 		: QObject(parent), dnssref(0), bonjourSocket(0) {

src/bonjour/BonjourServiceRegister.h

@@ -30,14 +30,11 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef BONJOURSERVICEREGISTER_H
 #define BONJOURSERVICEREGISTER_H
 
-#include <QtCore/QObject>
-
-#include "bonjourrecord.h"
-class QSocketNotifier;
-
 // Bonjour flags
 #include <dns_sd.h>
 
+#include "BonjourRecord.h"
+
 typedef uint32_t DNSServiceFlags;
 typedef int32_t DNSServiceErrorType;
 typedef struct _DNSServiceRef_t *DNSServiceRef;

src/bonjour/BonjourServiceResolver.cpp

@@ -27,11 +27,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <QtCore/QSocketNotifier>
-#include <QtNetwork/QHostInfo>
-#include <QtCore/QtEndian>
-
-#include "bonjourserviceresolver.h"
+#include "BonjourServiceResolver.h"
 
 BonjourServiceResolver::ResolveRecord::ResolveRecord(const BonjourRecord &r, BonjourServiceResolver *p) : record(r), bsr(p), dnssref(NULL), bonjourSocket(NULL), bonjourPort(-1) {
 }

src/bonjour/BonjourServiceResolver.h

@@ -33,10 +33,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <dns_sd.h>
 
-#include "bonjourrecord.h"
-
-class QSocketNotifier;
-class QHostInfo;
+#include "BonjourRecord.h"
 
 class BonjourServiceResolver : public QObject {
 		Q_OBJECT

src/mumble/BonjourClient.cpp

@@ -30,8 +30,8 @@
 
 #include "BonjourClient.h"
 
-#include "bonjourservicebrowser.h"
-#include "bonjourserviceresolver.h"
+#include "BonjourServiceBrowser.h"
+#include "BonjourServiceResolver.h"
 
 BonjourClient::BonjourClient() {
 	bsrResolver = NULL;

src/mumble/BonjourClient.h

@@ -30,6 +30,8 @@
 #ifndef _BONJOURCLIENT_H
 #define _BONJOURCLIENT_H
 
+#include "mumble_pch.hpp"
+
 class BonjourServiceBrowser;
 class BonjourServiceResolver;
 
@@ -45,6 +47,4 @@ class BonjourClient : public QObject {
 		BonjourServiceResolver *bsrResolver;
 };
 
-#else
-class BonjourClient;
 #endif

src/mumble/ConfigWidget.h

@@ -32,6 +32,8 @@
 #ifndef _CONFIGWIDGET_H
 #define _CONFIGWIDGET_H
 
+#include "mumble_pch.hpp"
+
 struct Settings;
 class ConfigDialog;
 

src/mumble/ConnectDialog.cpp

@@ -36,9 +36,9 @@
 #include "WebFetch.h"
 
 #ifdef USE_BONJOUR
-#include "bonjourclient.h"
-#include "bonjourservicebrowser.h"
-#include "bonjourserviceresolver.h"
+#include "BonjourClient.h"
+#include "BonjourServiceBrowser.h"
+#include "BonjourServiceResolver.h"
 #endif
 
 QMap<QString, QIcon> ServerItem::qmIcons;

src/mumble/ConnectDialog.h

@@ -34,7 +34,7 @@
 #include "mumble_pch.hpp"
 #include "Timer.h"
 #include "Net.h"
-#include "bonjourrecord.h"
+#include "BonjourRecord.h"
 
 struct FavoriteServer;
 

src/mumble/mumble.pro

@@ -210,8 +210,8 @@ asio {
 bonjour {
 	DEFINES *= USE_BONJOUR
 
-	HEADERS *= ../bonjour/bonjourrecord.h ../bonjour/bonjourserviceresolver.h ../bonjour/bonjourservicebrowser.h BonjourClient.h
-	SOURCES *= ../bonjour/bonjourserviceresolver.cpp ../bonjour/bonjourservicebrowser.cpp BonjourClient.cpp
+	HEADERS *= ../bonjour/BonjourRecord.h ../bonjour/BonjourServiceResolver.h ../bonjour/BonjourServiceBrowser.h BonjourClient.h
+	SOURCES *= ../bonjour/BonjourServiceResolver.cpp ../bonjour/BonjourServiceBrowser.cpp BonjourClient.cpp
 	win32 {
 		INCLUDEPATH *= "$$BONJOUR_PATH/include"
 		QMAKE_LIBDIR *= "$$BONJOUR_PATH/lib/win32"

src/murmur/BonjourServer.cpp

@@ -27,7 +27,9 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+
 #include "BonjourServer.h"
+#include "BonjourServiceRegister.h"
 
 BonjourServer::BonjourServer() {
 	bsrRegister = NULL;

src/murmur/BonjourServer.h

@@ -30,7 +30,9 @@
 #ifndef _BONJOURSERVER_H
 #define _BONJOURSERVER_H
 
-#include "bonjourserviceregister.h"
+#include "murmur_pch.h"
+
+class BonjourServiceRegister;
 
 class BonjourServer : public QObject {
 	private:
@@ -43,6 +45,4 @@ class BonjourServer : public QObject {
 		BonjourServiceRegister *bsrRegister;
 };
 
-#else
-class BonjourServer;
 #endif

src/murmur/DBus.h

@@ -254,11 +254,5 @@ class MetaDBus : public QDBusAbstractAdaptor {
 		void stopped(int server_id);
 };
 
-
-// extern MurmurDBus *dbus;
-
-#else
-class MurmurDBus;
-class MetaDBus;
 #endif
 #endif

src/murmur/Meta.h

@@ -33,8 +33,8 @@
 
 #include "murmur_pch.h"
 #include "Timer.h"
-#include "Server.h"
-#include "DBus.h"
+
+class Server;
 
 struct MetaParams {
 	QDir qdBasePath;
@@ -146,6 +146,4 @@ class Meta : public QObject {
 
 extern Meta *meta;
 
-#else
-class Meta;
 #endif

src/murmur/MurmurIce.h

@@ -37,7 +37,11 @@
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
 #include "MurmurI.h"
-#include "Server.h"
+
+class Channel;
+class Server;
+class TextMessage;
+class User;
 
 class MurmurIce : public QObject {
 		friend class MurmurLocker;

src/murmur/Server.cpp

@@ -44,6 +44,10 @@
 #include "PacketDataStream.h"
 #include "ServerUser.h"
 
+#ifdef USE_BONJOUR
+#include "BonjourServiceRegister.h"
+#endif
+
 #define UDP_PACKET_SIZE 1024
 
 LogEmitter::LogEmitter(QObject *p) : QObject(p) {

src/murmur/Server.h

@@ -35,11 +35,8 @@
 #include "murmur_pch.h"
 #include "Message.h"
 #include "Timer.h"
-#include "User.h"
-#include "Connection.h"
 #include "Net.h"
 #include "ACL.h"
-#include "DBus.h"
 
 #ifdef USE_BONJOUR
 #include "BonjourServer.h"
@@ -48,6 +45,7 @@
 class Channel;
 class PacketDataStream;
 class ServerUser;
+class User;
 
 struct TextMessage {
 	QList<unsigned int> qlSessions;
@@ -328,6 +326,4 @@ class Server : public QThread {
 #undef MUMBLE_MH_MSG
 };
 
-#else
-class Server;
 #endif

src/murmur/ServerUser.cpp

@@ -31,6 +31,7 @@
 
 #include "murmur_pch.h"
 
+#include "Server.h"
 #include "ServerUser.h"
 #include "Meta.h"
 

src/murmur/ServerUser.h

@@ -124,6 +124,4 @@ class ServerUser : public Connection, public User {
 		ServerUser(Server *parent, QSslSocket *socket);
 };
 
-#else
-class ServerUser;
 #endif

src/murmur/Tray.h

@@ -32,7 +32,6 @@
 #define _TRAY_H
 
 #include "murmur_pch.h"
-#include "Server.h"
 
 class Tray : public QObject {
 	private:

src/murmur/murmur.pro

@@ -108,8 +108,8 @@ ice {
 bonjour {
 	DEFINES *= USE_BONJOUR
 
-	HEADERS *= ../bonjour/bonjourrecord.h ../bonjour/bonjourserviceregister.h BonjourServer.h
-	SOURCES *= ../bonjour/bonjourserviceregister.cpp BonjourServer.cpp
+	HEADERS *= ../bonjour/BonjourRecord.h ../bonjour/BonjourServiceRegister.h BonjourServer.h
+	SOURCES *= ../bonjour/BonjourServiceRegister.cpp BonjourServer.cpp
 	INCLUDEPATH *= ../bonjour
 	win32 {
 		INCLUDEPATH *= "$$BONJOUR_PATH/include"