- Pass target lib includes through cmakes property system

- Rename all ui_*.hh includes to ui_*.h

cmake/type.cmake

@@ -64,6 +64,12 @@ acg_drop_templates (sources)
 acg_add_library ( ${TYPENAME} SHARED ${ui} ${sources} ${headers})
 set_target_properties ( ${TYPENAME} PROPERTIES MACOSX_RPATH 0 )
 
+# Allow targets depending on ACG find the autogenerated header files
+target_include_directories( ${TYPENAME} PUBLIC
+                            ${CMAKE_CURRENT_BINARY_DIR}/${TYPENAME}_autogen/include )
+
+
+
 add_dependencies( ${TYPENAME} OpenMeshCore OpenMeshTools ACG OpenFlipperPluginLib)
 
 

libs_required/ACG/CMakeLists.txt

@@ -137,6 +137,10 @@ acg_print_configure_header (ACG "ACG")
 
 RECURSE_GROUPS( ${CMAKE_CURRENT_SOURCE_DIR} )
 
+# Allow targets depending on ACG find the autogenerated header files
+target_include_directories( ACG PUBLIC
+                             ${CMAKE_CURRENT_BINARY_DIR}/ACG_autogen/include )
+
 target_link_libraries ( ACG  ${OPENMESH_LIBRARIES}
                              ${QT_LIBRARIES}
                              ${OPENGL_LIBRARIES}

libs_required/ACG/QtWidgets/QtClippingDialog.hh

@@ -63,7 +63,7 @@
 //== INCLUDES =================================================================
 
 
-#include "ui_QtClippingDialogUi.hh"
+#include "ui_QtClippingDialogUi.h"
 #include "../Config/ACGDefines.hh"
 
 #include <QDialog>

libs_required/ACG/QtWidgets/QtCoordFrameDialog.hh

@@ -63,7 +63,7 @@
 //== INCLUDES =================================================================
 
 
-#include "ui_QtCoordFrameDialogUi.hh"
+#include "ui_QtCoordFrameDialogUi.h"
 #include "../Math/VectorT.hh"
 #include <vector>
 

libs_required/ACG/QtWidgets/QtMaterialDialog.cc

@@ -39,15 +39,6 @@
  *                                                                           *
 \*===========================================================================*/
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision$                                                       *
- *   $Author$                                                      *
- *   $Date$                   *
- *                                                                           *
-\*===========================================================================*/
-
-
 
 //=============================================================================
 //
@@ -58,10 +49,13 @@
 
 //== INCLUDES =================================================================
 
+
 #include "QtMaterialDialog.hh"
 #include "../Scenegraph/MaterialNode.hh"
 
 
+
+
 //== NAMESPACES ==============================================================
 
 

libs_required/ACG/QtWidgets/QtMaterialDialog.hh

@@ -39,16 +39,6 @@
  *                                                                           *
 \*===========================================================================*/
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision$                                                       *
- *   $Author$                                                      *
- *   $Date$                   *
- *                                                                           *
-\*===========================================================================*/
-
-
-
 //=============================================================================
 //
 //  CLASS QtMaterialDialog
@@ -56,14 +46,13 @@
 //=============================================================================
 
 
-#ifndef ACG_QTMATERIALDIALOG_HH
-#define ACG_QTMATERIALDIALOG_HH
+#pragma once
 
 
 //== INCLUDES =================================================================
 
 
-#include "ui_QtMaterialDialogUi.hh"
+#include "ui_QtMaterialDialogUi.h"
 
 #include "../Math/VectorT.hh"
 #include "../GL/gl.hh"
@@ -199,6 +188,4 @@ private:
 } // namespace QtWidgets
 } // namespace ACG
 //=============================================================================
-#endif // ACG_QTMATERIALDIALOG_HH defined
-//=============================================================================
 

libs_required/ACG/QtWidgets/QtPrincipalAxisDialog.hh

@@ -54,7 +54,7 @@
 
 
 // qmake users have to include
-#include "ui_QtPrincipalAxisDialogBaseUi.hh"
+#include "ui_QtPrincipalAxisDialogBaseUi.h"
 
 // ACGMake users have to include
 // #include "QtPrincipalAxisDialogBaseUi.hh"

libs_required/ACG/QtWidgets/QtSceneGraphWidget.cc

@@ -39,16 +39,6 @@
  *                                                                           *
 \*===========================================================================*/
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision$                                                       *
- *   $Author$                                                      *
- *   $Date$                   *
- *                                                                           *
-\*===========================================================================*/
-
-
-
 //=============================================================================
 //
 //  CLASS QtSceneGraphWidget - IMPLEMENTATION
@@ -71,6 +61,8 @@
 #include "../Scenegraph/ShaderNode.hh"
 #include "../Scenegraph/CoordFrameNode.hh"
 
+#include "ui_QtMaterialDialogUi.h"
+
 #include <stdint.h>
 
 

libs_required/ACG/QtWidgets/QtShaderDialog.hh

@@ -63,7 +63,7 @@
 //== INCLUDES =================================================================
 
 
-#include "ui_QtShaderDialogUi.hh"
+#include "ui_QtShaderDialogUi.h"
 #include "../Config/ACGDefines.hh"
 
 #include <QColor>

libs_required/ACG/QtWidgets/QtTextureDialog.hh

@@ -63,7 +63,7 @@
 //== INCLUDES =================================================================
 
 
-#include "ui_QtTextureDialogUi.hh"
+#include "ui_QtTextureDialogUi.h"
 
 #include "../Math/VectorT.hh"
 #include "../GL/gl.hh"

widgets/PluginDialog/PluginDialog.cc

@@ -45,6 +45,9 @@
 
 #include "PluginDialog.hh"
 
+#include <QMessageBox>
+#include <QMenu>
+
 const QColor PluginDialog::blockColor_  = QColor(228, 155, 18);
 const QColor PluginDialog::unloadColor_ = QColor(172, 172, 172);
 const QColor PluginDialog::loadedBuiltInColor_ = QColor(208, 240, 192);

widgets/PluginDialog/PluginDialog.hh

@@ -41,10 +41,8 @@
 
 
 
-#include "ui_pluginDialog.hh"
+#include "ui_pluginDialog.h"
   
-#include <QtWidgets>
-
 #include <OpenFlipper/Core/PluginInfo.hh>
 
 class PluginDialog : public QDialog, public Ui::PluginDialog

widgets/aboutWidget/aboutWidget.cc

@@ -47,6 +47,8 @@
 
 #include <OpenFlipper/common/GlobalOptions.hh>
 
+#include <QKeyEvent>
+
 AboutWidget::AboutWidget(QWidget *parent )
     : QMainWindow(parent)
 {

widgets/aboutWidget/aboutWidget.hh

@@ -43,10 +43,7 @@
 
 #pragma once
 
-#include "ui_aboutWidget.hh"
-
-#include <QtWidgets>
-
+#include "ui_aboutWidget.h"
 
 
 class AboutWidget : public QMainWindow, public Ui::AboutWidget

widgets/addEmptyWidget/addEmptyWidget.hh

@@ -39,19 +39,11 @@
 *                                                                            *
 \*===========================================================================*/
 
-
-
-
-
-
-#ifndef ADDEMPTYWIDGET_HH
-#define ADDEMPTYWIDGET_HH
+#pragma once
 
 #include <OpenFlipper/common/Types.hh>
 
-#include "ui_addEmpty.hh"
-
-#include <QtWidgets>
+#include "ui_addEmpty.h"
 
 class addEmptyWidget : public QDialog, public Ui::addEmpty
 {
@@ -69,4 +61,3 @@ class addEmptyWidget : public QDialog, public Ui::addEmpty
     void slotAddEmpty();
 };
 
-#endif

widgets/helpWidget/helpWidget.hh

@@ -41,20 +41,10 @@
 
 
 
-
-/*
- * helpWidget.hh
- *
- *  Created on: Apr 7, 2009
- *      Author: kremer
- */
-
 #ifndef HELPWIDGET_HH_
 #define HELPWIDGET_HH_
 
-#include "ui_helpWidget.hh"
-
-#include <QtWidgets>
+#include "ui_helpWidget.h"
 
 #include <QtHelp>
 #include <QTextDocument>

widgets/optionsWidget/downloader.cc

@@ -47,6 +47,7 @@
 #include "optionsWidget.hh"
 #include <iostream>
 #include <OpenFlipper/common/GlobalOptions.hh>
+#include <QMessageBox>
 
 void OptionsWidget::startDownload( QString _url ) {
    QUrl url(_url);

widgets/optionsWidget/keyBindings.cc

@@ -44,6 +44,7 @@
 #include <OpenFlipper/BasePlugin/BaseInterface.hh>
 
 #include "optionsWidget.hh"
+#include <QMessageBox>
 
 /// get the pluginInfo object corresponding to the given pluginName
 int OptionsWidget::getPluginInfo(QString pluginName){

widgets/optionsWidget/optionsWidget.cc

@@ -50,6 +50,9 @@
 #include <ACG/GL/ShaderCache.hh>
 
 #include "optionsWidget.hh"
+#include <QColorDialog>
+#include <QOpenGLContext>
+#include <QMessageBox>
 
 OptionsWidget::OptionsWidget(std::vector<PluginInfo>& _plugins, std::vector<KeyBinding>& _core, InverseKeyMap& _invKeys, QWidget *parent)
   : QWidget(parent),

widgets/optionsWidget/optionsWidget.hh

@@ -50,9 +50,7 @@
 #include <OpenFlipper/Core/PluginInfo.hh>
 #include <ACG/Scenegraph/DrawModes.hh>
 
-#include "ui_optionsWidget.hh"
-  
-#include <QtWidgets>
+#include "ui_optionsWidget.h"
 
 #include <QStringList>
 #include <QProgressDialog>

widgets/postProcessorWidget/postProcessorWidget.hh

@@ -41,13 +41,11 @@
 
 #pragma once
 
-#include "ui_postProcessorWidget.hh"
+#include "ui_postProcessorWidget.h"
 
 #include <vector>
 
-#include <QDialog>
-#include <QPoint>
-#include <QStringList>
+
 class QWidget;
 class QFrame;
 class PostProcessorInfo;

widgets/processManagerWidget/BlockingWidget.hh

@@ -45,6 +45,8 @@
 
 #include "processManagerWidget.hh"
 
+#include <QLabel>
+
 class BlockingWidget : public QWidget {
 Q_OBJECT
 

widgets/processManagerWidget/processManagerWidget.hh

@@ -43,16 +43,10 @@
 
 #pragma once
 
-/*
- * processManagerWidget.hh
- *
- *  Created on: Apr 7, 2009
- *      Author: kremer
- */
 
-#include "ui_processManagerWidget.hh"
-
-#include <QtWidgets>
+#include "ui_processManagerWidget.h"
+#include <QPushButton>
+#include <QProgressBar>
 
 // A button class that additionally stores
 // an attached job's id.

widgets/rendererWidget/rendererObjectWidget.hh

@@ -42,13 +42,14 @@
 
 #pragma once
 
-#include "ui_rendererObjectWidget.hh"
-#include <QDialog>
+#include "ui_rendererObjectWidget.h"
 
 #include <OpenFlipper/common/RendererInfo.hh>
 #include "renderObjectHighLighter.hh"
 #include "TextBrowserWidget.hh"
 
+#include <QDialog>
+
 class RendererObjectWidget : public QDialog, public Ui::RendererObjectWidget
 {
   Q_OBJECT

widgets/rendererWidget/rendererWidget.hh

@@ -41,11 +41,11 @@
 
 #pragma once
 
-#include "ui_rendererWidget.hh"
-#include <QDialog>
+#include "ui_rendererWidget.h"
+
 #include <QVector>
-#include <QLabel>
-#include <QFrame>
+#include <QDialog>
+
 
 #include <OpenFlipper/common/RendererInfo.hh>
 

widgets/snapshotDialog/SnapshotDialog.cc

@@ -44,6 +44,9 @@
 #include "SnapshotDialog.hh"
 #include <OpenFlipper/common/GlobalOptions.hh>
 
+#include <QMessageBox>
+#include <QFileDialog>
+
 SnapshotDialog::SnapshotDialog(QString _suggest, bool _captureViewers, int _w, int _h, QWidget *parent)
  : QDialog(parent),
    captureViewers_(_captureViewers),

widgets/snapshotDialog/SnapshotDialog.hh

@@ -41,9 +41,7 @@
 
 
 
-#include "ui_SnapshotDialog.hh"
-
-#include <QtWidgets>
+#include "ui_SnapshotDialog.h"
 
 class SnapshotDialog : public QDialog, public Ui::SnapshotDialog
 {

widgets/stereoSettingsWidget/stereoSettingsWidget.hh

@@ -43,17 +43,8 @@
 
 #pragma once
 
-/*
- * stereoSettingsWidget.hh
- *
- *  Created on: Nov 9, 2009
- *      Author: kremer
- */
-
-#include "ui_stereoSettingsWidget.hh"
-
-#include <QtWidgets>
 
+#include "ui_stereoSettingsWidget.h"
 
 
 class StereoSettingsWidget : public QWidget, public Ui::StereoSettingsWidget

widgets/videoCaptureDialog/VideoCaptureDialog.cc

@@ -43,6 +43,8 @@
 
 #include "VideoCaptureDialog.hh"
 #include <OpenFlipper/common/GlobalOptions.hh>
+#include <QMessageBox>
+#include <QFileDialog>
 
 VideoCaptureDialog::VideoCaptureDialog(QWidget *parent) : QDialog(parent)
 {

widgets/videoCaptureDialog/VideoCaptureDialog.hh

@@ -41,10 +41,7 @@
 
 
 
-#include "ui_VideoCaptureDialog.hh"
-
-#include <QtWidgets>
-
+#include "ui_VideoCaptureDialog.h"
 
 class VideoCaptureDialog : public QDialog, public Ui::VideoCaptureDialog
 {

widgets/viewModeWidget/viewModeChangeWidget.hh

@@ -39,19 +39,12 @@
 *                                                                            *
 \*===========================================================================*/
 
+#pragma once
 
+#include "ui_viewModeChange.h"
 
 
 
-
-#ifndef VIEWMODECHANGEWIDGET_HH
-#define VIEWMODECHANGEWIDGET_HH
-
-#include "ui_viewModeChange.hh"
-#include <QStringList>
-#include <QVector>
-#include <QWidgetAction>
-
 struct ViewMode;
 
 class viewModeChangeWidget : public QWidget, public Ui::ViewModeChangeDialog
@@ -85,4 +78,3 @@ class viewModeChangeWidget : public QWidget, public Ui::ViewModeChangeDialog
    
 };
 
-#endif //VIEWMODECHANGEWIDGET_HH

widgets/viewModeWidget/viewModeWidget.hh

@@ -39,17 +39,9 @@
 *                                                                            *
 \*===========================================================================*/
 
+#pragma once
 
-
-
-
-
-#ifndef VIEWMODEWIDGET_HH
-#define VIEWMODEWIDGET_HH
-
-#include "ui_viewMode.hh"
-#include <QStringList>
-#include <QVector>
+#include "ui_viewMode.h"
 
 struct ViewMode;
 
@@ -260,4 +252,3 @@ class viewModeWidget : public QDialog, public Ui::viewMode
       
 };
 
-#endif //VIEWMODEWIDGET_HH