songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cosmetic changes

This commit is contained in:
Laurent Rineau 2023-09-14 14:39:45 +02:00
parent 03e89cc97b
commit 09a4ac1ad7
6 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
View File

@ -61,7 +61,7 @@ else()
endif() endif()
if(NOT Qt6_FOUND) if(NOT Qt6_FOUND)
set(OTR2_MISSING_DEPS "Qt6.4, ${OTR2_MISSING_DEPS}") set(OTR2_MISSING_DEPS "Qt6, ${OTR2_MISSING_DEPS}")
endif() endif()
message("NOTICE: This demo requires ${OTR2_MISSING_DEPS} and will not be compiled.") message("NOTICE: This demo requires ${OTR2_MISSING_DEPS} and will not be compiled.")

6
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
View File

@ -7,7 +7,6 @@ project(Periodic_Lloyd_3_Demo)
# Find includes in corresponding build directories # Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6) find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6)
@ -21,8 +20,9 @@ if(CGAL_Qt6_FOUND
include_directories(BEFORE ./) include_directories(BEFORE ./)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
if(DEFINED QT_QCOLLECTIONGENERATOR_EXECUTABLE) if(DEFINED QT_QCOLLECTIONGENERATOR_EXECUTABLE)

3
Three/include/CGAL/Three/exceptions.h
View File

@ -19,9 +19,6 @@
#include <exception> #include <exception>
#include <QString> #include <QString>
#include <QApplication> #include <QApplication>
//#include <QScriptable>
//#include <QScriptContext>
//#include <QScriptEngine>
#include <optional> #include <optional>
#include <QStringList> #include <QStringList>

4
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
View File

@ -7,9 +7,6 @@ project(Triangulation_3_Demo)
# Find includes in corresponding build directories # Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6) find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6)
find_package(Qt6 QUIET COMPONENTS Widgets OpenGL) find_package(Qt6 QUIET COMPONENTS Widgets OpenGL)
@ -40,6 +37,7 @@ endif()
if(CGAL_Qt6_FOUND AND Qt6_FOUND) if(CGAL_Qt6_FOUND AND Qt6_FOUND)
include_directories(BEFORE ./) include_directories(BEFORE ./)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)

4
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
View File

@ -72,8 +72,6 @@ void MainWindow::connectActions()
// Help menu actions // Help menu actions
QObject::connect(this->actionDemo_Help, SIGNAL(triggered()), QObject::connect(this->actionDemo_Help, SIGNAL(triggered()),
this->viewer, SLOT(help())); this->viewer, SLOT(help()));
QObject::connect(this->actionAbout_T3_demo, SIGNAL(triggered()),
this, SLOT(popupAboutDemo()));
// Quit // Quit
QObject::connect(this->actionQuit, SIGNAL(triggered()), QObject::connect(this->actionQuit, SIGNAL(triggered()),
@ -214,7 +212,7 @@ void MainWindow::on_actionClear_Scene_triggered()
void MainWindow::popupAboutCGAL() void MainWindow::popupAboutCGAL()
{ {
// read contents from .html file // read contents from .html file
QFile about_CGAL(":/documentation/documentation/about.html"); QFile about_CGAL(":/documentation/documentation/about_CGAL.html");
about_CGAL.open(QIODevice::ReadOnly|QIODevice::Text); about_CGAL.open(QIODevice::ReadOnly|QIODevice::Text);
QString about_CGAL_txt = QTextStream(&about_CGAL).readAll(); QString about_CGAL_txt = QTextStream(&about_CGAL).readAll();

6
Triangulation_3/demo/Triangulation_3/MainWindow.ui
View File

@ -112,7 +112,6 @@
<string>Help</string> <string>Help</string>
</property> </property>
<addaction name="actionDemo_Help"/> <addaction name="actionDemo_Help"/>
<addaction name="actionAbout_T3_demo"/>
</widget> </widget>
<addaction name="menuFile"/> <addaction name="menuFile"/>
<addaction name="menuEdit"/> <addaction name="menuEdit"/>
@ -555,11 +554,6 @@
<string>Stop Animation</string> <string>Stop Animation</string>
</property> </property>
</action> </action>
<action name="actionAbout_T3_demo">
<property name="text">
<string>About T3_demo</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="3" margin="1"/> <layoutdefault spacing="3" margin="1"/>
<customwidgets> <customwidgets>