Commit b2b687b2 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'Enable_autouic' into 'master'

Enable autouic

See merge request !123
parents 549bde32 09829c8b
......@@ -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
......@@ -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>
......
......@@ -47,6 +47,7 @@
#include "optionsWidget.hh"
#include <iostream>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QMessageBox>
void OptionsWidget::startDownload( QString _url ) {
QUrl url(_url);
......
......@@ -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){
......
......@@ -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),
......
......@@ -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>
......
......@@ -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;
......
......@@ -45,6 +45,8 @@
#include "processManagerWidget.hh"
#include <QLabel>
class BlockingWidget : public QWidget {
Q_OBJECT
......
......@@ -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.
......
......@@ -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
......
......@@ -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>
......
......@@ -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),
......
......@@ -41,9 +41,7 @@
#include "ui_SnapshotDialog.hh"
#include <QtWidgets>
#include "ui_SnapshotDialog.h"
class SnapshotDialog : public QDialog, public Ui::SnapshotDialog
{
......
......@@ -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
......
......@@ -43,6 +43,8 @@
#include "VideoCaptureDialog.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QMessageBox>
#include <QFileDialog>
VideoCaptureDialog::VideoCaptureDialog(QWidget *parent) : QDialog(parent)
{
......
......@@ -41,10 +41,7 @@
#include "ui_VideoCaptureDialog.hh"
#include <QtWidgets>
#include "ui_VideoCaptureDialog.h"
class VideoCaptureDialog : public QDialog, public Ui::VideoCaptureDialog
{
......
......@@ -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
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment