Added Clang support. Code cleanup.

Hexta · Jan 14, 2014 · 6789ac5 · 6789ac5
1 parent 8431d66
commit 6789ac5
Show file tree

Hide file tree

Showing 24 changed files with 336 additions and 339 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@ nbproject
 *.a
 *.orig
 *.*~
+moc_*
+ui_*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(project "JAA")
+project("JAA")
 
 cmake_policy(SET CMP0020 NEW)
 
@@ -13,6 +13,9 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 elseif(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP")
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -ggdb -Wall -Wextra")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x -g -fno-omit-frame-pointer -Wall -Wextra -pedantic -Weverything -Wnosystem-headers")
 endif()
 
 find_package(Qt5Widgets REQUIRED)
@@ -25,20 +28,17 @@ add_subdirectory(Compressor)
 
 include_directories(${CMAKE_SOURCE_DIR})
 
+set(${PROJECT_NAME}_SRC main.cpp)
 
+add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SRC})
 
-set(${project}_SRC main.cpp)
-
-add_executable(${project} ${${project}_SRC})
+qt5_use_modules(${PROJECT_NAME} Widgets Gui Core)
 
-qt5_use_modules(${project} Widgets Gui Core)
-
-target_link_libraries(${project}
+target_link_libraries(${PROJECT_NAME}
     ${QT_LIBRARIES}
-    ${project}_face
-    ${project}_compressor
-    ${project}_codec
+    ${PROJECT_NAME}_face
+    ${PROJECT_NAME}_compressor
+    ${PROJECT_NAME}_codec
 )
 
-
-add_dependencies(${project} ${project}_face)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_face)
diff --git a/Compressor/CMakeLists.txt b/Compressor/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy(SET CMP0020 NEW)
 find_package(Qt5Widgets REQUIRED)
 add_definitions(${QT5_DEFINITIONS})
 
-set(${project}_compressor_SRC
+set(${PROJECT_NAME}_compressor_SRC
        compressor.cpp
 )
 
@@ -16,15 +16,15 @@ add_subdirectory(FilesTable)
 add_subdirectory(CRC)
 
 
-add_library(${project}_compressor STATIC
-    ${${project}_compressor_SRC}
+add_library(${PROJECT_NAME}_compressor STATIC
+    ${${PROJECT_NAME}_compressor_SRC}
 )
 
-qt5_use_modules(${project}_compressor Widgets Gui Core)
+qt5_use_modules(${PROJECT_NAME}_compressor Widgets Gui Core)
 
-target_link_libraries(${project}_compressor
-    ${project}_codec
-    ${project}_datablock
-    ${project}_filestable
-    ${project}_crc
+target_link_libraries(${PROJECT_NAME}_compressor
+    ${PROJECT_NAME}_codec
+    ${PROJECT_NAME}_datablock
+    ${PROJECT_NAME}_filestable
+    ${PROJECT_NAME}_crc
 )
diff --git a/Compressor/CRC/CMakeLists.txt b/Compressor/CRC/CMakeLists.txt
@@ -1,16 +1,16 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(${project}_crc_SRC
+set(${PROJECT_NAME}_crc_SRC
        crc.cpp
 )
 
 include_directories(${CMAKE_SOURCE_DIR})
 
 
-add_library(${project}_crc STATIC
-    ${${project}_crc_SRC}
+add_library(${PROJECT_NAME}_crc STATIC
+    ${${PROJECT_NAME}_crc_SRC}
 )
 
-target_link_libraries(${project}_crc
+target_link_libraries(${PROJECT_NAME}_crc
 )
 
diff --git a/Compressor/CRC/crc.cpp b/Compressor/CRC/crc.cpp
@@ -1,6 +1,5 @@
 #include "crc.h"
-#include <stddef.h>
-#include <stdint.h>
+
 /*
   Name  : CRC-32
   Poly  : 0x04C11DB7    x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11

diff --git a/Compressor/CRC/crc.h b/Compressor/CRC/crc.h
@@ -1,9 +1,6 @@
-#ifndef CRC_H
-#define CRC_H
+#pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <cstdlib>
 
 uint_least32_t crc32(const unsigned char * buf, size_t len);
-
-#endif /* CRC_H */
diff --git a/Compressor/Codec/CMakeLists.txt b/Compressor/Codec/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(${project}_codec_SRC
+set(${PROJECT_NAME}_codec_SRC
        codecAbstract.cpp
        codec.cpp
 )
@@ -10,13 +10,13 @@ include_directories(${CMAKE_SOURCE_DIR})
 add_subdirectory(Codecs)
 
 
-add_library(${project}_codec STATIC
-    ${${project}_codec_SRC}
+add_library(${PROJECT_NAME}_codec STATIC
+    ${${PROJECT_NAME}_codec_SRC}
 )
 
-target_link_libraries(${project}_codec
-    ${project}_codec_bwt
-    ${project}_codec_huff
-    ${project}_codec_mtf
-    ${project}_codec_rle
+target_link_libraries(${PROJECT_NAME}_codec
+    ${PROJECT_NAME}_codec_bwt
+    ${PROJECT_NAME}_codec_huff
+    ${PROJECT_NAME}_codec_mtf
+    ${PROJECT_NAME}_codec_rle
 )
diff --git a/Compressor/Codec/Codecs/BWT/CMakeLists.txt b/Compressor/Codec/Codecs/BWT/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(${project}_codec_bwt_SRC
+set(${PROJECT_NAME}_codec_bwt_SRC
     codecBWT.cpp
 )
 
@@ -9,10 +9,10 @@ include_directories(${CMAKE_SOURCE_DIR})
 add_subdirectory(divsuf)
 
 
-add_library(${project}_codec_bwt STATIC
-    ${${project}_codec_bwt_SRC}
+add_library(${PROJECT_NAME}_codec_bwt STATIC
+    ${${PROJECT_NAME}_codec_bwt_SRC}
 )
 
-target_link_libraries(${project}_codec_bwt
-    ${project}_divsuf
+target_link_libraries(${PROJECT_NAME}_codec_bwt
+    ${PROJECT_NAME}_divsuf
 )
diff --git a/Compressor/Codec/Codecs/BWT/divsuf/CMakeLists.txt b/Compressor/Codec/Codecs/BWT/divsuf/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(${project}_divsuf_SRC
+set(${PROJECT_NAME}_divsuf_SRC
     divsufsort.cpp
     sssort.cpp
     trsort.cpp
@@ -9,10 +9,10 @@ set(${project}_divsuf_SRC
 include_directories(${CMAKE_SOURCE_DIR})
 
 
-add_library(${project}_divsuf STATIC
-    ${${project}_divsuf_SRC}
+add_library(${PROJECT_NAME}_divsuf STATIC
+    ${${PROJECT_NAME}_divsuf_SRC}
 )
 
-target_link_libraries(${project}_divsuf
+target_link_libraries(${PROJECT_NAME}_divsuf
 )
 
diff --git a/Compressor/Codec/Codecs/HUFF/CMakeLists.txt b/Compressor/Codec/Codecs/HUFF/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(${project}_codec_huff_SRC
+set(${PROJECT_NAME}_codec_huff_SRC
     codecHUFF.cpp
     shclib.cpp
 )
 
 include_directories(${CMAKE_SOURCE_DIR})
 
-add_library(${project}_codec_huff STATIC
-    ${${project}_codec_huff_SRC}
+add_library(${PROJECT_NAME}_codec_huff STATIC
+    ${${PROJECT_NAME}_codec_huff_SRC}
 )
 
-target_link_libraries(${project}_codec_huff
+target_link_libraries(${PROJECT_NAME}_codec_huff
 )
diff --git a/Compressor/Codec/Codecs/MTF/CMakeLists.txt b/Compressor/Codec/Codecs/MTF/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(${project}_codec_mtf_SRC
+set(${PROJECT_NAME}_codec_mtf_SRC
     codecMTF.cpp
 )
 
 include_directories(${CMAKE_SOURCE_DIR})
 
-add_library(${project}_codec_mtf STATIC
-    ${${project}_codec_mtf_SRC}
+add_library(${PROJECT_NAME}_codec_mtf STATIC
+    ${${PROJECT_NAME}_codec_mtf_SRC}
 )
 
-target_link_libraries(${project}_codec_mtf
+target_link_libraries(${PROJECT_NAME}_codec_mtf
 )
diff --git a/Compressor/Codec/Codecs/RLE/CMakeLists.txt b/Compressor/Codec/Codecs/RLE/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(${project}_codec_rle_SRC
+set(${PROJECT_NAME}_codec_rle_SRC
     codecRLE.cpp
 )
 
 include_directories(${CMAKE_SOURCE_DIR})
 
-add_library(${project}_codec_rle STATIC
-    ${${project}_codec_rle_SRC}
+add_library(${PROJECT_NAME}_codec_rle STATIC
+    ${${PROJECT_NAME}_codec_rle_SRC}
 )
 
-target_link_libraries(${project}_codec_rle
+target_link_libraries(${PROJECT_NAME}_codec_rle
 )
diff --git a/Compressor/Codec/Codecs/RLE/codecRLE.cpp b/Compressor/Codec/Codecs/RLE/codecRLE.cpp
@@ -19,6 +19,8 @@
 
 #include <climits>
 
+#include <cstdio>
+
 Codec_RLE::Codec_RLE() { }
 
 Codec_RLE::~Codec_RLE() { }

diff --git a/Compressor/Codec/codec.h b/Compressor/Codec/codec.h
@@ -15,20 +15,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.      *
  ******************************************************************************/
 
-#ifndef CODEC_H
-#define	CODEC_H
+#pragma once
 
-#include "Codecs/BWT/codecBWT.h"
-#include "Codecs/MTF/codecMTF.h"
-#include "Codecs/RLE/codecRLE.h"
-#include "Codecs/HUFF/codecHUFF.h"
+#include "Compressor/Codec/Codecs/BWT/codecBWT.h"
+#include "Compressor/Codec/Codecs/MTF/codecMTF.h"
+#include "Compressor/Codec/Codecs/RLE/codecRLE.h"
+#include "Compressor/Codec/Codecs/HUFF/codecHUFF.h"
+
+class Codec : public virtual Codec_BWT, public virtual Codec_HUFF,
+    public virtual Codec_MTF, public virtual Codec_RLE {
 
-class Codec : public virtual Codec_BWT, public virtual Codec_HUFF, public virtual Codec_MTF, public virtual Codec_RLE {
 public:
   Codec();
   virtual ~Codec();
-private:
 
+private:
 };
-
-#endif	/* CODEC_H */
diff --git a/Compressor/Codec/codecAbstract.cpp b/Compressor/Codec/codecAbstract.cpp
@@ -16,8 +16,9 @@
  ******************************************************************************/
 
 #include "codecAbstract.h"
-#include "../DataBlock/dataBlock.h"
-#include "../DataBlock/dataBlockHeader.h"
+
+#include "Compressor/DataBlock/dataBlock.h"
+#include "Compressor/DataBlock/dataBlockHeader.h"
 
 Codec_abstract::Codec_abstract() : data(0), decodedDataSize(0),
     encodedDataSize(0), codecParams(0) { }
@@ -48,4 +49,4 @@ Codec_abstract::recordOutHeader(DataBlockHeader *outHeader, uint64_t id) {
   outHeader->setDecodedDataSize(decodedDataSize);
   outHeader->setEncodedDataSize(encodedDataSize);
   outHeader->setCodecParams(codecParams);
-}
+}
diff --git a/Compressor/DataBlock/CMakeLists.txt b/Compressor/DataBlock/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package(Qt5Widgets REQUIRED)
 
 add_definitions(${QT5_DEFINITIONS})
 
-set(${project}_datablock_SRC
+set(${PROJECT_NAME}_datablock_SRC
        dataBlock.cpp
        dataBlockHeader.cpp
        readerDataBlockHeader.cpp
@@ -16,12 +16,12 @@ set(${project}_datablock_SRC
 include_directories(${CMAKE_SOURCE_DIR})
 
 
-add_library(${project}_datablock STATIC
-    ${${project}_datablock_SRC}
+add_library(${PROJECT_NAME}_datablock STATIC
+    ${${PROJECT_NAME}_datablock_SRC}
 )
 
-qt5_use_modules(${project}_datablock Widgets Gui Core OpenGL)
+qt5_use_modules(${PROJECT_NAME}_datablock Widgets Gui Core OpenGL)
 
-target_link_libraries(${project}_datablock
+target_link_libraries(${PROJECT_NAME}_datablock
     ${QT_LIBRARIES}
 )
diff --git a/Compressor/DataBlock/dataBlock.cpp b/Compressor/DataBlock/dataBlock.cpp
@@ -37,7 +37,7 @@ dataSize(0), nBytesToRead(setBlockSize), header(new DataBlockHeader()),
 outBlock(new dataT(setBlockSize * 2)),
 recoveryMode(false) { }
 
-DataBlock::DataBlock() : data(new vector < unsigned char >), dataSize(0), nBytesToRead(0),
+DataBlock::DataBlock() : data(new dataT), dataSize(0), nBytesToRead(0),
 header(new DataBlockHeader()), outBlock(NULL), recoveryMode(false) {
   data->reserve(MIN_RAW_BLOCK_SIZE);
 }

diff --git a/Compressor/DataBlock/dataBlock.h b/Compressor/DataBlock/dataBlock.h
@@ -15,21 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.      *
  ******************************************************************************/
 
-#ifndef DATABLOCK_H
-#define	DATABLOCK_H
+#pragma once
 
-#include "../private/consts.h"
-#include "../CRC/crc.h"
+#include "Compressor/private/consts.h"
 
-#include <iostream>
-#include <sstream>
-#include <cstring>
 #include <vector>
-#include <stdint.h>
 
-using namespace std;
-
-typedef vector < unsigned char > dataT;
+typedef std::vector<unsigned char> dataT;
 
 class QFile;
 class DataBlockHeader;
@@ -72,7 +64,4 @@ class DataBlock {
   bool recoveryMode;
 
   uint32_t calcCRC();
-
 };
-
-#endif	/* DATABLOCK_H */
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,5 @@ nbproject @@
     *.a
     *.orig
     *.*~
+    moc_*
+    ui_*