Rename config.h to CalamaresConfig.h

Avoid name clashes with partitionmanager's config.h

src/libcalamares/CMakeLists.txt

@@ -5,8 +5,8 @@ add_definitions( -DQT_SHARED )
 add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
 add_definitions( -DDLLEXPORT_PRO )
 
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in
-                ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in
+                ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h )
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../calamares/CalamaresVersion.h.in
                 ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h )
 
@@ -61,7 +61,7 @@ file( GLOB rootHeaders "*.h" )
 file( GLOB kdsingleapplicationguardHeaders "kdsingleapplicationguard/*.h" )
 file( GLOB utilsHeaders "utils/*.h" )
 
-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/libcalamares )
+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h DESTINATION include/libcalamares )
 install( FILES ${rootHeaders}                       DESTINATION include/libcalamares )
 install( FILES ${kdsingleapplicationguardHeaders}   DESTINATION include/libcalamares/kdsingleapplicationguard )
 install( FILES ${utilsHeaders}                      DESTINATION include/libcalamares/utils )

src/libcalamares/CalamaresConfig.h.in

@@ -1,5 +1,5 @@
-#ifndef CONFIG_H_IN
-#define CONFIG_H_IN
+#ifndef CALAMARESCONFIG_H
+#define CALAMARESCONFIG_H
 
 #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
 #define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}"
@@ -9,4 +9,4 @@
 
 //cmakedefines for CMake variables (e.g. for optdepends) go here
 
-#endif // CONFIG_H_IN
+#endif // CALAMARESCONFIG_H

src/libcalamares/utils/CalamaresUtils.cpp

@@ -23,7 +23,7 @@
 
 #include "CalamaresUtils.h"
 
-#include "config.h"
+#include "CalamaresConfig.h"
 
 #include <QCoreApplication>
 #include <QDebug>