Commits

Wei Cheng Pan committed 9b6bc31

Fix compile error.

  • Participants
  • Parent commits 5670c7a
  • Branches develop

Comments (0)

Files changed (15)

File Krapture/core/include/xTitan/Network/SimpleServer.hpp

 
 class SimpleSocket;
 
-class XTITAN_CORE_DLL SimpleServer: public QObject {
+class XTITAN_DLL SimpleServer: public QObject {
 	Q_OBJECT
 public:
 	explicit SimpleServer( QObject * parent = 0 );

File Krapture/core/include/xTitan/Network/SimpleSocket.hpp

 
 namespace xtitan {
 
-class XTITAN_CORE_DLL SimpleSocket: public QObject {
+class XTITAN_DLL SimpleSocket: public QObject {
 	Q_OBJECT
 public:
 	typedef QPair< QString, QVariant > Packet;

File Krapture/core/include/xTitan/Utility/Logger.hpp

 
 namespace xtitan {
 
-class XTITAN_CORE_DLL Logger {
+class XTITAN_DLL Logger {
 public :
 	static Logger & instance();
 

File Krapture/core/include/xTitan/Utility/Setting.hpp

 
 namespace xtitan {
 
-class XTITAN_CORE_DLL Setting {
+class XTITAN_DLL Setting {
 public:
 	static Setting & instance();
 

File Krapture/core/src/Network/SimpleServer.cpp

 
 
 using xtitan::SimpleServer;
+using xtitan::SimpleSocket;
 
 
 SimpleServer::SimpleServer( QObject * parent ):

File Krapture/core/src/Utility/Logger.cpp

-#include "LoggerPrivate.hpp"
+#include "Logger_p.hpp"
 
 #include <cassert>
 
 
 Logger::Private::Private():
 lock(),
-tcDir( Setting::getInstance().get( "TestCasePath" ) ),
+tcDir( Setting::instance().get( "TestCasePath" ) ),
 fout( this->tcDir.filePath( QDateTime::currentDateTime().toString( "yyyyMMdd_hhmmss" ) + ".log" ) ),
 stream() {
 	if( !this->fout.isOpen() ) {
 /**
  * @warning This function is NOT thread-safe
  */
-Logger & Logger::getInstance() {
+Logger & Logger::instance() {
 	if( !Private::self ) {
 		Private::self.reset( new Logger, Private::destroy );
 	}
 void Logger::log( const QString & msg ) {
 	QMutexLocker locker( &this->p_->lock );
 
-	this->p_->stream << msg << "\n";	
+	this->p_->stream << msg << "\n";
 	this->p_->stream.flush();
 
 	locker.unlock();

File Krapture/server/src/Exception/BasicError.cpp

 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "basicerrorprivate.hpp"
+#include "BasicError_p.hpp"
+
+
+using xtitan::BasicError;
 
-using namespace krapture::error;
 
 /**
  * @class krapture::error::BasicError

File Krapture/server/src/Exception/BasicError.hpp

 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#ifndef KRAPTURE_ERROR_BASICERROR_HPP
-#define KRAPTURE_ERROR_BASICERROR_HPP
-
-#include <QtCore/QString>
+#ifndef XTITAN_ERROR_BASICERROR_HPP
+#define XTITAN_ERROR_BASICERROR_HPP
 
 #include <exception>
 #include <memory>
 
-namespace krapture {
-	namespace error {
+#include <QtCore/QString>
+
+
+namespace xtitan {
 
-		class BasicError : public std::exception {
-		public:
-			explicit BasicError( const char * message );
-			explicit BasicError( const wchar_t * message );
-			explicit BasicError( const std::string & message );
-			explicit BasicError( const std::wstring & message );
-			explicit BasicError( const QString & message );
-			virtual ~BasicError() throw();
+class BasicError: public std::exception {
+public:
+	explicit BasicError( const char * message );
+	explicit BasicError( const wchar_t * message );
+	explicit BasicError( const std::string & message );
+	explicit BasicError( const std::wstring & message );
+	explicit BasicError( const QString & message );
+	virtual ~BasicError() throw();
 
-			const QString & getMessage() const;
-			virtual const char * what() const throw();
+	const QString & getMessage() const;
+	virtual const char * what() const throw();
 
-		private:
-			class Private;
-			std::shared_ptr< Private > p_;
-		};
+private:
+	class Private;
+	std::shared_ptr< Private > p_;
+};
 
-	}
 }
 
 #endif

File Krapture/server/src/Exception/BasicError_p.hpp

 #ifndef KRAPTURE_ERROR_BASICERRORPRIVATE_HPP
 #define KRAPTURE_ERROR_BASICERRORPRIVATE_HPP
 
-#include "basicerror.hpp"
+#include "BasicError.hpp"
 
-namespace krapture {
-	namespace error {
 
-		class BasicError::Private {
-		public:
-			explicit Private( const QString & );
+namespace xtitan {
 
-			QString message;
-		};
+class BasicError::Private {
+public:
+	explicit Private( const QString & );
+
+	QString message;
+};
 
-	}
 }
 
 #endif

File Krapture/server/src/Exception/IOError.cpp

 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "ioerror.hpp"
+#include "IOError.hpp"
+
+
+using xtitan::IOError;
 
-using namespace krapture::error;
 
 /**
  * @class krapture::error::IOError

File Krapture/server/src/Exception/IOError.hpp

 #ifndef KRAPTURE_ERROR_IOERROR_HPP
 #define KRAPTURE_ERROR_IOERROR_HPP
 
-#include "basicerror.hpp"
+#include "BasicError.hpp"
 
-namespace krapture {
-	namespace error {
+namespace xtitan {
 
-		class IOError : public BasicError {
-		public:
-			explicit IOError( const char * message );
-			explicit IOError( const wchar_t * message );
-			explicit IOError( const std::string & message );
-			explicit IOError( const std::wstring & message );
-			explicit IOError( const QString & message );
-		};
+class IOError: public BasicError {
+public:
+	explicit IOError( const char * message );
+	explicit IOError( const wchar_t * message );
+	explicit IOError( const std::string & message );
+	explicit IOError( const std::wstring & message );
+	explicit IOError( const QString & message );
+};
 
-	}
 }
 
 #endif

File Krapture/server/src/Exception/InternalError.cpp

 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "internalerror.hpp"
+#include "InternalError.hpp"
+
+
+using xtitan::InternalError;
 
-using krapture::error::InternalError;
 
 /**
  * @class krapture::error::InternalError

File Krapture/server/src/Exception/InternalError.hpp

 #ifndef KRAPTURE_ERROR_INTERNALERROR_HPP
 #define KRAPTURE_ERROR_INTERNALERROR_HPP
 
-#include "basicerror.hpp"
+#include "BasicError.hpp"
 
-namespace krapture {
-	namespace error {
 
-		class InternalError : public BasicError {
-		public:
-			explicit InternalError( const char * message );
-			explicit InternalError( const wchar_t * message );
-			explicit InternalError( const std::string & message );
-			explicit InternalError( const std::wstring & message );
-			explicit InternalError( const QString & message );
-		};
+namespace xtitan {
+
+class InternalError: public BasicError {
+public:
+	explicit InternalError( const char * message );
+	explicit InternalError( const wchar_t * message );
+	explicit InternalError( const std::string & message );
+	explicit InternalError( const std::wstring & message );
+	explicit InternalError( const QString & message );
+};
 
-	}
 }
 
 #endif

File Krapture/server/src/Exception/SqlError.cpp

 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "sqlerror.hpp"
+#include "SqlError.hpp"
+
+
+using xtitan::SqlError;
 
-using namespace krapture::error;
 
 /**
  * @class krapture::error::SqlError

File Krapture/server/src/Exception/SqlError.hpp

 #ifndef KRAPTURE_ERROR_SQLERROR_HPP
 #define KRAPTURE_ERROR_SQLERROR_HPP
 
-#include "ioerror.hpp"
+#include "IOError.hpp"
 
-namespace krapture {
-	namespace error {
+namespace xtitan {
 
-		class SqlError : public IOError {
-		public:
-			explicit SqlError( const char * message );
-			explicit SqlError( const wchar_t * message );
-			explicit SqlError( const std::string & message );
-			explicit SqlError( const std::wstring & message );
-			explicit SqlError( const QString & message );
-		};
+class SqlError : public IOError {
+public:
+	explicit SqlError( const char * message );
+	explicit SqlError( const wchar_t * message );
+	explicit SqlError( const std::string & message );
+	explicit SqlError( const std::wstring & message );
+	explicit SqlError( const QString & message );
+};
 
-	}
 }
 
 #endif