Add new cmake flags and fix warnings

CMakeLists.txt

@@ -144,7 +144,7 @@ SET( CMAKE_CXX_FLAGS "" )
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
 
 ######################################################################################
-# Configure targets
+# Compiler options
 ######################################################################################
 
 SET(CMAKE_CXX_STANDARD 14)
@@ -159,6 +159,24 @@ ENDIF()
 
 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
 
+ADD_DEFINITIONS(-DQT_NO_CAST_TO_ASCII
+                #-DQT_NO_CAST_FROM_ASCII
+                -DQT_NO_URL_CAST_FROM_STRING
+                -DQT_NO_CAST_FROM_BYTEARRAY
+                #-DQT_NO_SIGNALS_SLOTS_KEYWORDS
+                #-DQT_USE_QSTRINGBUILDER
+               )
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
+endif()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -Wlogical-op" )
+   endif()
+endif()
+
 IF( USE_WERROR )
   SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
 ENDIF()
@@ -166,6 +184,11 @@ ENDIF()
 SET( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0" )
 SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2" )
 
+
+######################################################################################
+# Configure targets
+######################################################################################
+
 ADD_FEATURE_INFO(CalypApp     BUILD_APP    "Build Graphical interface")
 ADD_FEATURE_INFO(CalypTools   BUILD_TOOLS  "Build Command line tool"  )
 ADD_FEATURE_INFO(DynLoad    USE_DYNLOAD   "Support for dynamic module load" )

app/VideoSubWindow.h

@@ -132,7 +132,6 @@ public:
 
   void setCurrFrame( CalypFrame* pcCurrFrame );
 
-  QScrollArea* getScroll() { return m_pcScrollArea; }
   CalypFileInfo getStreamInfo() { return m_sStreamInfo; }
   QString getStreamInformation() { return m_cStreamInformation; }
   CalypStream* getInputStream() { return m_pCurrStream; }
@@ -219,7 +218,7 @@ public Q_SLOTS:
   void updatePixelValueStatusBar( const QPoint& pos );
 };
 
-Q_DECLARE_METATYPE( CalypFileInfo );
-Q_DECLARE_METATYPE( CalypFileInfoVector );
+Q_DECLARE_METATYPE( CalypFileInfo )
+Q_DECLARE_METATYPE( CalypFileInfoVector )
 
 #endif  // __VIDEOSUBWINDOW_H__

app/dialog/ConfigureFormatDialog.h

@@ -81,7 +81,7 @@ private:
   QSpinBox* m_spinBoxFrameRate;
 };
 
-Q_DECLARE_METATYPE( CalypStandardResolution );
-Q_DECLARE_METATYPE( CalypStandardResolutionVector );
+Q_DECLARE_METATYPE( CalypStandardResolution )
+Q_DECLARE_METATYPE( CalypStandardResolutionVector )
 
 #endif  // __CONFIGUREFORMATDIALOG_H__

app/main.cpp

@@ -47,9 +47,9 @@ int main( int argc, char* argv[] )
   qRegisterMetaTypeStreamOperators<CalypStandardResolutionVector>();
 
   QApplication application( argc, argv );
-  QApplication::setApplicationName( "Calyp" );
-  QApplication::setApplicationVersion( CALYP_VERSION_STRING );
-  QApplication::setOrganizationName( "PixLRA" );
+  QApplication::setApplicationName( QStringLiteral( "Calyp" ) );
+  QApplication::setApplicationVersion( QStringLiteral( CALYP_VERSION_STRING ) );
+  QApplication::setOrganizationName( QStringLiteral( "PixLRA" ) );
 
 #ifdef USE_QTDBUS
   /**
@@ -62,7 +62,7 @@ int main( int argc, char* argv[] )
     QStringList filenameList;
     for( int i = 1; i < argc; i++ )
     {
-      filenameList.append( QFileInfo( QString( argv[i] ) ).absoluteFilePath() );
+      filenameList.append( QFileInfo( QLatin1String( argv[i] ) ).absoluteFilePath() );
     }
     if( filenameList.isEmpty() )
     {
@@ -73,7 +73,7 @@ int main( int argc, char* argv[] )
     bool foundRunningService = false;
     if( !force_new )
     {
-      QDBusReply<bool> there = sessionBusinterface->isServiceRegistered( CALYP_DBUS_SESSION_NAME );
+      QDBusReply<bool> there = sessionBusinterface->isServiceRegistered( QStringLiteral( CALYP_DBUS_SESSION_NAME ) );
       foundRunningService = there.isValid() && there.value();
 
       if( foundRunningService )
@@ -82,7 +82,7 @@ int main( int argc, char* argv[] )
 
         // open given session
         QDBusMessage m = QDBusMessage::createMethodCall(
-            CALYP_DBUS_SESSION_NAME, QStringLiteral( CALYP_DBUS_PATH ),
+            QStringLiteral( CALYP_DBUS_SESSION_NAME ), QStringLiteral( CALYP_DBUS_PATH ),
             QStringLiteral( CALYP_DBUS_SESSION_NAME ), QStringLiteral( "activate" ) );
 
         QDBusConnection::sessionBus().call( m );
@@ -96,7 +96,7 @@ int main( int argc, char* argv[] )
         foreach( const QString& file, filenameList )
         {
           QDBusMessage m = QDBusMessage::createMethodCall(
-              CALYP_DBUS_SESSION_NAME, QStringLiteral( CALYP_DBUS_PATH ),
+              QStringLiteral( CALYP_DBUS_SESSION_NAME ), QStringLiteral( CALYP_DBUS_PATH ),
               QStringLiteral( CALYP_DBUS_SESSION_NAME ), QStringLiteral( "loadFile" ) );
 
           QList<QVariant> dbusargs;
@@ -130,7 +130,7 @@ int main( int argc, char* argv[] )
   /**
    * if we arrive here, we need to start a new calyp instance!
    */
-  QDBusConnection::sessionBus().registerService( CALYP_DBUS_SESSION_NAME );
+  QDBusConnection::sessionBus().registerService( QStringLiteral( CALYP_DBUS_SESSION_NAME ) );
 #endif
   MainWindow mainwindow;
   mainwindow.show();

examples/modules/CMakeLists.txt

@@ -7,13 +7,15 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8.9 )
 
 PROJECT( "modules_example" )
 
+# THIS
 # FIND_PACKAGE( Calyp )
-
-INCLUDE_DIRECTORIES( ${CALYP_INCLUDE_DIRS} )
+#INCLUDE_DIRECTORIES( ${CALYP_INCLUDE_DIRS} )
+# OR
+INCLUDE_DIRECTORIES( ../../lib )
 
 ADD_LIBRARY(FrameBinarization SHARED FrameBinarization_APIv1.cpp)
 TARGET_LINK_LIBRARIES( FrameBinarization ${CALYP_LINKER_LIBS}  )
 
 ADD_LIBRARY(AbsoluteFrameDifferenceExample SHARED AbsoluteFrameDifferenceExample.cpp)
-TARGET_LINK_LIBRARIES( AbsoluteFrameDifferenceExample ${CALYP_LINKER_LIBS}  )
+TARGET_LINK_LIBRARIES( AbsoluteFrameDifferenceExample ${PROJECT_LIBRARY} ${CALYP_LINKER_LIBS}  )