Fixed some of GCC warnings

.gitignore

@@ -29,3 +29,5 @@
 
 # Ignores 'build' in any sub folder
 build/
+*.user*
+

cmake/CompileSettings.cmake

@@ -9,25 +9,36 @@ MESSAGE(STATUS "==============================================================="
 MESSAGE(STATUS "============ Configuring CompileSettings  =====================")
 
 
+IF(APPLE)
+
+  # Unify visibility to meet llvm's default.
+  INCLUDE(CheckCXXCompilerFlag)
+  check_cxx_compiler_flag("-fvisibility-inlines-hidden" SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG)
+  IF(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+  ENDIF()
+
+ENDIF(APPLE)
+
 IF(CMAKE_COMPILER_IS_GNUCC)
 
   SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
   SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-  SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -march=native -funroll-loops -ffast-math")
-  SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -march=native -funroll-loops")
+  SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -funroll-loops -ffast-math")
+  SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -funroll-loops")
 
   OPTION (USE_PEDANTIC_FLAGS "Use Pedantic Flags in GCC" ON)
   IF(USE_PEDANTIC_FLAGS)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wno-long-long -Wno-variadic-macros")
     SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wno-long-long -Wno-variadic-macros")
   ENDIF()
-  
+
   OPTION (USE_DEBUG_SYMBOLS "Use Debug Symbols" OFF)
   IF(USE_DEBUG_SYMBOLS)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
     SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -g")
   ENDIF()
-  
+
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 IF(NOT MSVC)
@@ -38,9 +49,9 @@ IF(NOT MSVC)
     CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 
     IF(COMPILER_SUPPORTS_CXX11)
-  	  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     ELSEIF(COMPILER_SUPPORTS_CXX0X)
-  	  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
     ELSE()
       SET(USE_CPP_11 OFF)
       MESSAGE(STATUS "Compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
@@ -65,4 +76,4 @@ IF(USE_OpenMP)
   ENDIF()
 ENDIF()
 
-MESSAGE(STATUS "===============================================================")
+MESSAGE(STATUS "===============================================================")

examples/CMakeLists.txt

@@ -13,3 +13,4 @@ ADD_SUBDIRECTORY(demo)
 ADD_SUBDIRECTORY(extension)
 ADD_SUBDIRECTORY(object_controller)
 ADD_SUBDIRECTORY(simple)
+ADD_SUBDIRECTORY(json)

examples/canvas_typed/mainwindow.cpp

@@ -151,23 +151,23 @@ MainWindow::MainWindow(QWidget *parent)
     propertyEditor = new QtTreePropertyBrowser(dock);
     propertyEditor->setFactoryForManager(doubleManager, doubleSpinBoxFactory);
     propertyEditor->setFactoryForManager(stringManager, lineEditFactory);
-    propertyEditor->setFactoryForManager(colorManager->subIntPropertyManager(), spinBoxFactory);
+    propertyEditor->setFactoryForManager(colorManager->subStringPropertyManager(), lineEditFactory);
     propertyEditor->setFactoryForManager(fontManager->subIntPropertyManager(), spinBoxFactory);
     propertyEditor->setFactoryForManager(fontManager->subBoolPropertyManager(), checkBoxFactory);
     propertyEditor->setFactoryForManager(fontManager->subEnumPropertyManager(), comboBoxFactory);
     propertyEditor->setFactoryForManager(pointManager->subIntPropertyManager(), spinBoxFactory);
     propertyEditor->setFactoryForManager(sizeManager->subIntPropertyManager(), spinBoxFactory);
     dock->setWidget(propertyEditor);
 
-    currentItem = 0;
+    currentItem = nullptr;
 
     connect(canvasView, SIGNAL(itemClicked(QtCanvasItem *)),
             this, SLOT(itemClicked(QtCanvasItem *)));
     connect(canvasView, SIGNAL(itemMoved(QtCanvasItem *)),
             this, SLOT(itemMoved(QtCanvasItem *)));
 
     fillView();
-    itemClicked(0);
+    itemClicked(nullptr);
 }
 
 void MainWindow::newRectangle()

examples/json/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Tell CMake to run moc when necessary:
+set(CMAKE_AUTOMOC ON)
+
+# As moc files are generated in the binary dir, tell CMake
+# to always look for includes there:
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+SET(example_name json)
+
+SET(KIT_SRCS
+    json_settings_widget.cpp
+    json.cpp
+)
+
+ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
+TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})
+target_compile_definitions(${example_name} PRIVATE -DDEBUG_BUILD)

examples/json/json.cpp

@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+**
+** Contact: Nokia Corporation ([email protected])
+**
+** This file is part of a Qt Solutions component.
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+#include "json_settings_widget.h"
+
+#include <QApplication>
+#include <QFile>
+
+#include <QMessageBox>
+#include <QtDebug>
+
+const char *sample_layout = "sample.json";
+const char *sample_settings = "setup.json";
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    JsonSettingsWidget extraSettings;
+
+    if(!extraSettings.loadLayoutFromFile(sample_settings, sample_layout))
+    {
+        QMessageBox::warning(nullptr, "oops", extraSettings.errorString());
+        return 1;
+    }
+
+    extraSettings.connect(&extraSettings, &JsonSettingsWidget::settingsChanged,
+                            []()
+    {
+        qDebug() << "Setup Changed!";
+    });
+
+    QWidget *w = extraSettings.getWidget();
+    w->show();
+
+    int ret = app.exec();
+
+    extraSettings.saveSettingsIntoFile(sample_settings);
+
+    return ret;
+}