[FireNET] Code style fixed

afrostalin · afrostalin · commit 81b0c09fa108 · 2017-02-06T12:08:28.000+03:00
diff --git a/src/server/Core/remoteserver.h b/src/server/Core/remoteserver.h
@@ -39,7 +39,7 @@ class RemoteServer : public QTcpServer
 	
 private:
 	bool                     CreateServer();
-    virtual void             incomingConnection(qintptr socketDescriptor);
+	virtual void             incomingConnection(qintptr socketDescriptor);
 public slots:
 	void                     Update();
 	void                     CloseConnection();
diff --git a/src/server/Core/tcpconnection.h b/src/server/Core/tcpconnection.h
@@ -43,9 +43,9 @@ public slots:
 	void                  received();
 	void                  sended();
 private:
-    ClientQuerys*         pQuery;
+	ClientQuerys*         pQuery;
 	QSslSocket*           m_Socket;
-	SClient				  m_Client;
+	SClient               m_Client;
 	std::queue<NetPacket> m_Packets;
 private:
 	int                   m_maxPacketSize;
diff --git a/src/server/Core/tcpserver.h b/src/server/Core/tcpserver.h
@@ -23,7 +23,7 @@ class TcpServer : public QTcpServer
     explicit TcpServer(QObject *parent = nullptr);
 	~TcpServer();
 public:
-    void              SetMaxThreads(int maximum);
+	void              SetMaxThreads(int maximum);
 	void              SetMaxConnections(int value);
 	void              SetConnectionTimeout(int value);
 	bool              Listen(const QHostAddress &address, quint16 port);
@@ -63,7 +63,7 @@ public slots:
 	void              MessageSended();
 signals:
 	void              connecting(qintptr handle, TcpThread *runnable, TcpConnection* connection);
-	void			  closing();
+	void              closing();
 private:
 	int               m_maxThreads;
 	int               m_maxConnections;
diff --git a/src/server/Core/tcpthread.h b/src/server/Core/tcpthread.h
@@ -24,21 +24,21 @@ class TcpThread : public QObject, public QRunnable
     explicit TcpThread(QObject *parent = nullptr);
     ~TcpThread();
 public:
-    void           run();
-	int            Count();
-	void           SendGlobalMessage(NetPacket &packet);
+	void                  run();
+	int                   Count();
+	void                  SendGlobalMessage(NetPacket &packet);
 private:
-	TcpConnection* CreateConnection();
-	void           AddSignals(TcpConnection* connection);
+	TcpConnection*        CreateConnection();
+	void                  AddSignals(TcpConnection* connection);
 public slots:
-	void		   connecting(qintptr handle, TcpThread *runnable, TcpConnection* connection);
-	void           closing();
-	void           opened();
-	void           closed();
+	void                  connecting(qintptr handle, TcpThread *runnable, TcpConnection* connection);
+	void                  closing();
+	void                  opened();
+	void                  closed();
 signals:
-	void           started();
-	void           finished();
-	void           quit();
+	void                  started();
+	void                  finished();
+	void                  quit();
 private:
 	QEventLoop*           m_loop;
 	QReadWriteLock        m_lock;
diff --git a/src/server/Tools/scripts.h b/src/server/Tools/scripts.h
@@ -14,9 +14,9 @@ class Scripts : public QObject
     explicit Scripts(QObject *parent = nullptr);
 	~Scripts();
 public:
-	void					Clear();
-	void					LoadShopScript();
-	void					LoadTrustedServerList();
+	void                    Clear();
+	void                    LoadShopScript();
+	void                    LoadTrustedServerList();
 public:
 	QVector<SShopItem>      GetShop();
 	QVector<STrustedServer> GetTrustedList();
diff --git a/src/server/Tools/settings.h b/src/server/Tools/settings.h
@@ -28,17 +28,17 @@ class SettingsManager : public QObject
 	void               Clear();
 	QVariant           GetVariable(const QString &key);	
 	QString            GetDescription(const QString &key);
-	bool			   FindVariabelMatches(const QString &key);
-	bool			   CheckVariableExists(const QString &key);
+	bool               FindVariabelMatches(const QString &key);
+	bool               CheckVariableExists(const QString &key);
 	QStringList        GetVariablesList();
 public:
 	void               SetVariable(const QString &key, const QVariant &value);
-	void			   BlockOnlineUpdate() { bBlockOnlineUpdate = true; }
+	void               BlockOnlineUpdate() { bBlockOnlineUpdate = true; }
 public:
-	void			   RegisterVariable(const QString &key, const QVariant &value, const QString &description, bool bCanChangeOnline, void (*pCallback)(QVariant) = nullptr);
+	void               RegisterVariable(const QString &key, const QVariant &value, const QString &description, bool bCanChangeOnline, void (*pCallback)(QVariant) = nullptr);
 private:
 	QVector<SVariable> m_Variables;
-	QMutex			   m_Mutex;
+	QMutex             m_Mutex;
 	bool               bBlockOnlineUpdate;
 };
 
diff --git a/src/server/UI/mainwindow.h b/src/server/UI/mainwindow.h
@@ -28,24 +28,24 @@ class MainWindow : public QMainWindow
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 public:
-    void LogToOutput(ELogType type, const QString& msg);
+	void            LogToOutput(ELogType type, const QString& msg);
 private:
-	void			ClearOutput();
-	void			ClearStatus();
+	void            ClearOutput();
+	void            ClearStatus();
 public slots:
-	void			CleanUp();
-	void			UpdateServerStatus();
-	void			EnableStressMode();
+	void            CleanUp();
+	void            UpdateServerStatus();
+	void            EnableStressMode();
 private slots:
-	void			on_Input_returnPressed();
+	void            on_Input_returnPressed();
 signals:
-	void			stop();
-	void			scroll();
+	void            stop();
+	void            scroll();
 private:
     Ui::MainWindow* ui;
-    int			    m_OutputItemID;
-	QTimer		    m_UpdateTimer;
-	QMutex			m_Mutex;
+    int             m_OutputItemID;
+	QTimer          m_UpdateTimer;
+	QMutex          m_Mutex;
 };	
 
 #endif // MAINWINDOW_H
diff --git a/src/server/Workers/Databases/dbworker.h b/src/server/Workers/Databases/dbworker.h
@@ -19,21 +19,21 @@ class DBWorker : public QObject
     explicit DBWorker(QObject *parent = 0);
 	~DBWorker();
 public:
-	void			Init();
-	void			Clear();
+	void            Init();
+	void            Clear();
 public:
-	bool			UserExists(const QString &login);
-	bool			ProfileExists(int uid);
-	bool			NicknameExists(const QString &nickname);
+	bool            UserExists(const QString &login);
+	bool            ProfileExists(int uid);
+	bool            NicknameExists(const QString &nickname);
 public:
-	int				GetFreeUID();
-	int				GetUIDbyNick(const QString &nickname);
-	SUser*			GetUserData(const QString &login);
-	SProfile*		GetUserProfile(int uid);
+	int             GetFreeUID();
+	int             GetUIDbyNick(const QString &nickname);
+	SUser*          GetUserData(const QString &login);
+	SProfile*       GetUserProfile(int uid);
 public:
-	bool			CreateUser(int uid, const QString &login, const QString &password);
-	bool			CreateProfile(SProfile *profile);
-	bool			UpdateProfile(SProfile *profile);
+	bool            CreateUser(int uid, const QString &login, const QString &password);
+	bool            CreateProfile(SProfile *profile);
+	bool            UpdateProfile(SProfile *profile);
 public:
 	RedisConnector* pRedis;
 	MySqlConnector* pMySql;
diff --git a/src/server/Workers/Databases/httpconnector.h b/src/server/Workers/Databases/httpconnector.h
@@ -17,23 +17,23 @@ class HttpConnector : public QObject
     explicit HttpConnector(QObject *parent = nullptr);
 	~HttpConnector();
 public:
-	bool	     Login(const QString &login, const QString &password);
-	bool		 Register(const QString &login, const QString &password);
+	bool         Login(const QString &login, const QString &password);
+	bool         Register(const QString &login, const QString &password);
 public:
-	int			 GetUID();
+	int          GetUID();
 	int			 GetError();
 private:
-	void	     SendPostRequest(QUrl url, QByteArray requestData);
+	void         SendPostRequest(QUrl url, QByteArray requestData);
 public slots:
 	virtual void replyFinished(QNetworkReply* reply);
 private:
 	// Login error types : 0 - Login not found, 1 - Account blocked, 2 - Incorrect password, 3 - Double authorization
 	// Register error types : 0 - Login alredy register, 1 - Can't create account, 2 - Double registration
-	int			 m_lastError;
-	int			 m_uid;
-	bool		 bHaveResult;
-	bool		 bSuccessAuth;
-	bool		 bSuccessReg;
+	int          m_lastError;
+	int          m_uid;
+	bool         bHaveResult;
+	bool         bSuccessAuth;
+	bool         bSuccessReg;
 };
 
 #endif // HTTPCONNECTOR_H
diff --git a/src/server/Workers/Databases/redisconnector.h b/src/server/Workers/Databases/redisconnector.h
@@ -21,18 +21,18 @@ class RedisConnector : public QObject
 	void                                         run();
 	bool                                         Connect();
 	bool                                         IsConnected();
-	void										 Disconnect();
+	void                                         Disconnect();
 public:
 	bool                                         HEXISTS(const QString &key, const QString &field);
-	bool										 HMSET(const QString &key, const std::vector<std::pair<std::string, std::string>>& field_val);
+	bool                                         HMSET(const QString &key, const std::vector<std::pair<std::string, std::string>>& field_val);
 	QVector<std::pair<std::string, std::string>> HGETALL(const QString &key);
-	bool										 SET(const QString &key, const QString &value);
-	QString										 GET(const QString &key);	
-	void										 BGSAVE();
+	bool                                         SET(const QString &key, const QString &value);
+	QString                                      GET(const QString &key);	
+	void                                         BGSAVE();
 public slots:
-	void										 disconnected();	
+	void                                         disconnected();	
 private:
-	cpp_redis::redis_client*					 pClient;
+	cpp_redis::redis_client*                     pClient;
 };
 
 #endif // REDISCONNECTOR_H
diff --git a/src/server/Workers/Packets/clientquerys.h b/src/server/Workers/Packets/clientquerys.h
@@ -21,36 +21,36 @@ class ClientQuerys : public QObject
 	void           SetSocket(QSslSocket* socket) { this->m_socket = socket; }
 	void           SetClient(SClient* client);
 	void           SetConnection(TcpConnection* connection) { this->m_Connection = connection; }
-
-    void           onLogin(NetPacket &packet);
-    void           onRegister(NetPacket &packet);
-
-    void           onCreateProfile(NetPacket &packet);
-    void           onGetProfile();
-
-    void           onGetShopItems();
-    void           onBuyItem(NetPacket &packet);
+	
+	void           onLogin(NetPacket &packet);
+	void           onRegister(NetPacket &packet);
+	
+	void           onCreateProfile(NetPacket &packet);
+	void           onGetProfile();
+	
+	void           onGetShopItems();
+	void           onBuyItem(NetPacket &packet);
 	void           onRemoveItem(NetPacket &packet);
-
-    void           onAddFriend(NetPacket &packet);
-    void           onRemoveFriend(NetPacket &packet);
+	
+	void           onAddFriend(NetPacket &packet);
+	void           onRemoveFriend(NetPacket &packet);
 
 	void           onChatMessage(NetPacket &packet);
 
 	void           onInvite(NetPacket &packet);
-	void		   onDeclineInvite(NetPacket &packet);
-
-	void		   onGetGameServer(NetPacket &packet);
+	void           onDeclineInvite(NetPacket &packet);
+	
+	void           onGetGameServer(NetPacket &packet);
 private:
-    bool           UpdateProfile(SProfile* profile);
+	bool           UpdateProfile(SProfile* profile);
 	// Depricated. TODO - Remove this
 	SShopItem      GetShopItemByName(const QString &name);
 private:
 	QSslSocket*    m_socket;
 	SClient*       m_Client;
 	TcpConnection* m_Connection;
-	bool		   bAuthorizated;
-	bool		   bRegistered;
-	bool		   bProfileCreated;
+	bool           bAuthorizated;
+	bool           bRegistered;
+	bool           bProfileCreated;
 };
 #endif // CLIENTQUERYS_H
diff --git a/src/server/Workers/Packets/remoteclientquerys.h b/src/server/Workers/Packets/remoteclientquerys.h
@@ -31,9 +31,9 @@ class RemoteClientQuerys : public QObject
 	void              onGameServerRegister(NetPacket &packet);
 	void              onGameServerUpdateInfo(NetPacket &packet);
 	void              onGameServerGetOnlineProfile(NetPacket &packet);
-	void			  onGameServerUpdateOnlineProfile(NetPacket &packet);
+	void              onGameServerUpdateOnlineProfile(NetPacket &packet);
 private:
-	bool			  CheckInTrustedList(const QString &name, const QString &ip, int port);
+	bool              CheckInTrustedList(const QString &name, const QString &ip, int port);
 private:
 	QSslSocket*       m_socket;
 	SRemoteClient*	  m_client;
diff --git a/src/server/global.h b/src/server/global.h
@@ -139,16 +139,16 @@ struct SGlobalEnvironment
 	}
 
 	// Pointers to main server systems
-	TcpServer*			 pServer;
-	RemoteServer*		 pRemoteServer;
-	DBWorker*			 pDBWorker;
-	QTimer*				 pTimer;
-	SettingsManager*	 pSettings;
-	Scripts*			 pScripts;
-	MainWindow*			 pUI;
+	TcpServer*           pServer;
+	RemoteServer*        pRemoteServer;
+	DBWorker*            pDBWorker;
+	QTimer*              pTimer;
+	SettingsManager*     pSettings;
+	Scripts*             pScripts;
+	MainWindow*          pUI;
 
 	// Server statistic
-	SServerStatus		 m_ServerStatus;	
+	SServerStatus        m_ServerStatus;	
 	int                  m_InputPacketsCount;
 	int                  m_InputSpeed;
 	int                  m_InputMaxSpeed;
@@ -163,15 +163,15 @@ struct SGlobalEnvironment
 	int                  m_MaxClientCount;
 
 	// Log level for file and UI
-	int					 m_FileLogLevel;
+	int                  m_FileLogLevel;
 	int                  m_UILogLevel;
 
 	// Server full name
-	QString				 m_serverFullName;
+	QString              m_serverFullName;
 
 	// Need for clearing server before quit
-	bool			     isQuiting;
-	bool			     isReadyToClose;
+	bool                 isQuiting;
+	bool                 isReadyToClose;
 };
 
 extern SGlobalEnvironment* gEnv;
diff --git a/src/server/serverThread.h b/src/server/serverThread.h
@@ -14,16 +14,16 @@ class CServerThread : public QObject
 	explicit CServerThread(QObject *parent = nullptr);
 	~CServerThread();
 private:
-	bool		Init();
-	void		StartLogging();
-	void		RegisterVariables();
-	void		ReadServerCFG();
-	void		EnableStressTest();
+	bool        Init();
+	void        StartLogging();
+	void        RegisterVariables();
+	void        ReadServerCFG();
+	void        EnableStressTest();
 public slots:
-	void		start();
-	void		stop();
+	void        start();
+	void        stop();
 signals:
-	void		EnableStressMode();
+	void        EnableStressMode();
 private:
 	QEventLoop* m_loop;
 };
