Fixed the god-awful indentation

This commit is contained in:
mathusummut
2018-05-06 00:01:36 +02:00
parent 643e3820f5
commit 35b7b1f1a6
459 changed files with 204893 additions and 217545 deletions

View File

@@ -13,8 +13,8 @@
#define _SHARED_PLATFORMCOMMON_MINIFTPSERVERTHREAD_H_
#ifdef WIN32
#include <winsock2.h>
#include <winsock.h>
#include <winsock2.h>
#include <winsock.h>
#endif
#include "base_thread.h"
@@ -27,47 +27,50 @@
using namespace std;
namespace Shared { namespace PlatformCommon {
namespace Shared {
namespace PlatformCommon {
// =====================================================
// class FTPServerThread
// =====================================================
// =====================================================
// class FTPServerThread
// =====================================================
class FTPServerThread : public BaseThread
{
protected:
std::pair<string,string> mapsPath;
std::pair<string,string> tilesetsPath;
std::pair<string,string> techtreesPath;
string tempFilesPath;
class FTPServerThread : public BaseThread {
protected:
std::pair<string, string> mapsPath;
std::pair<string, string> tilesetsPath;
std::pair<string, string> techtreesPath;
string tempFilesPath;
int portNumber;
int maxPlayers;
static FTPClientValidationInterface *ftpValidationIntf;
int portNumber;
int maxPlayers;
static FTPClientValidationInterface *ftpValidationIntf;
bool internetEnabled;
bool allowInternetTilesetFileTransfers;
bool allowInternetTechtreeFileTransfers;
bool internetEnabled;
bool allowInternetTilesetFileTransfers;
bool allowInternetTechtreeFileTransfers;
public:
public:
FTPServerThread(std::pair<string,string> mapsPath,
std::pair<string,string> tilesetsPath, std::pair<string,string> techtreesPath,
bool internetEnabledFlag,
bool allowInternetTilesetFileTransfers, bool allowInternetTechtreeFileTransfers,
int portNumber,int maxPlayers, FTPClientValidationInterface *ftpValidationIntf,
string tempFilesPath);
~FTPServerThread();
virtual void execute();
virtual void signalQuit();
virtual bool shutdownAndWait();
FTPServerThread(std::pair<string, string> mapsPath,
std::pair<string, string> tilesetsPath, std::pair<string, string> techtreesPath,
bool internetEnabledFlag,
bool allowInternetTilesetFileTransfers, bool allowInternetTechtreeFileTransfers,
int portNumber, int maxPlayers, FTPClientValidationInterface *ftpValidationIntf,
string tempFilesPath);
~FTPServerThread();
virtual void execute();
virtual void signalQuit();
virtual bool shutdownAndWait();
void setInternetEnabled(bool value, bool forceChange=false);
static void addClientToServerIPAddress(uint32 clientIp,uint32 ServerIp);
static FTPClientValidationInterface * getFtpValidationIntf() { return ftpValidationIntf; }
void setInternetEnabled(bool value, bool forceChange = false);
static void addClientToServerIPAddress(uint32 clientIp, uint32 ServerIp);
static FTPClientValidationInterface * getFtpValidationIntf() {
return ftpValidationIntf;
}
};
};
}}//end namespace
}
}//end namespace
#endif