From 939e80ab4bf411630300d5523edfdb88f2998dda Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Fri, 25 Dec 2020 10:43:22 -0800 Subject: [PATCH] Renamed view files. --- common/lc_application.cpp | 2 +- common/lc_mainwindow.cpp | 2 +- common/lc_minifigdialog.cpp | 2 +- common/lc_model.cpp | 2 +- common/lc_partselectionwidget.cpp | 2 +- common/lc_previewwidget.cpp | 2 +- common/lc_previewwidget.h | 2 +- common/{view.cpp => lc_view.cpp} | 2 +- common/{view.h => lc_view.h} | 0 common/lc_viewsphere.cpp | 2 +- common/lc_viewwidget.cpp | 2 +- common/project.cpp | 2 +- leocad.pro | 5 +++-- qt/lc_qaboutdialog.cpp | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) rename common/{view.cpp => lc_view.cpp} (99%) rename common/{view.h => lc_view.h} (100%) diff --git a/common/lc_application.cpp b/common/lc_application.cpp index a8d4e9ac..a5e9e1e7 100644 --- a/common/lc_application.cpp +++ b/common/lc_application.cpp @@ -8,7 +8,7 @@ #include "lc_qpreferencesdialog.h" #include "lc_partselectionwidget.h" #include "lc_shortcuts.h" -#include "view.h" +#include "lc_view.h" #include "camera.h" #include "lc_previewwidget.h" diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp index 3d3162fc..2921a408 100644 --- a/common/lc_mainwindow.cpp +++ b/common/lc_mainwindow.cpp @@ -16,7 +16,7 @@ #include "lc_renderdialog.h" #include "lc_instructionsdialog.h" #include "lc_profile.h" -#include "view.h" +#include "lc_view.h" #include "project.h" #include "piece.h" #include "camera.h" diff --git a/common/lc_minifigdialog.cpp b/common/lc_minifigdialog.cpp index 99cac209..ac579962 100644 --- a/common/lc_minifigdialog.cpp +++ b/common/lc_minifigdialog.cpp @@ -7,7 +7,7 @@ #include "lc_application.h" #include "pieceinf.h" #include "lc_library.h" -#include "view.h" +#include "lc_view.h" #include "camera.h" lcMinifigDialog::lcMinifigDialog(QWidget* Parent) diff --git a/common/lc_model.cpp b/common/lc_model.cpp index 9c5c1a8e..5551e30a 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -13,7 +13,7 @@ #include "lc_synth.h" #include "lc_file.h" #include "pieceinf.h" -#include "view.h" +#include "lc_view.h" #include "minifig.h" #include "lc_qarraydialog.h" #include "lc_qselectdialog.h" diff --git a/common/lc_partselectionwidget.cpp b/common/lc_partselectionwidget.cpp index 7925e1f8..306a2caf 100644 --- a/common/lc_partselectionwidget.cpp +++ b/common/lc_partselectionwidget.cpp @@ -9,7 +9,7 @@ #include "project.h" #include "pieceinf.h" #include "lc_scene.h" -#include "view.h" +#include "lc_view.h" #include "lc_glextensions.h" #include "lc_viewwidget.h" #include "lc_previewwidget.h" diff --git a/common/lc_previewwidget.cpp b/common/lc_previewwidget.cpp index 78f75f49..ecd4da4a 100644 --- a/common/lc_previewwidget.cpp +++ b/common/lc_previewwidget.cpp @@ -6,7 +6,7 @@ #include "lc_model.h" #include "lc_library.h" #include "lc_viewwidget.h" -#include "view.h" +#include "lc_view.h" lcPreviewDockWidget::lcPreviewDockWidget(QMainWindow* Parent) : QMainWindow(Parent) diff --git a/common/lc_previewwidget.h b/common/lc_previewwidget.h index d3f4bc9b..e3495a0c 100644 --- a/common/lc_previewwidget.h +++ b/common/lc_previewwidget.h @@ -1,6 +1,6 @@ #pragma once -#include "view.h" +#include "lc_view.h" class lcPreview; diff --git a/common/view.cpp b/common/lc_view.cpp similarity index 99% rename from common/view.cpp rename to common/lc_view.cpp index 5071d4f2..48ba5bc5 100644 --- a/common/view.cpp +++ b/common/lc_view.cpp @@ -1,8 +1,8 @@ #include "lc_global.h" +#include "lc_view.h" #include #include "lc_mainwindow.h" #include "camera.h" -#include "view.h" #include "texfont.h" #include "lc_texture.h" #include "piece.h" diff --git a/common/view.h b/common/lc_view.h similarity index 100% rename from common/view.h rename to common/lc_view.h diff --git a/common/lc_viewsphere.cpp b/common/lc_viewsphere.cpp index aae40ead..a462e79e 100644 --- a/common/lc_viewsphere.cpp +++ b/common/lc_viewsphere.cpp @@ -1,6 +1,6 @@ #include "lc_global.h" #include "lc_viewsphere.h" -#include "view.h" +#include "lc_view.h" #include "camera.h" #include "lc_context.h" #include "lc_stringcache.h" diff --git a/common/lc_viewwidget.cpp b/common/lc_viewwidget.cpp index 402b9fa6..f7a2cc56 100644 --- a/common/lc_viewwidget.cpp +++ b/common/lc_viewwidget.cpp @@ -7,7 +7,7 @@ #include "lc_mainwindow.h" #include "lc_partselectionwidget.h" #include "lc_context.h" -#include "view.h" +#include "lc_view.h" #include "texfont.h" #include "lc_viewsphere.h" #include "lc_stringcache.h" diff --git a/common/project.cpp b/common/project.cpp index 4e3034a6..c3b9fa67 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -7,7 +7,7 @@ #include "project.h" #include "image.h" #include "lc_mainwindow.h" -#include "view.h" +#include "lc_view.h" #include "lc_library.h" #include "lc_application.h" #include "lc_profile.h" diff --git a/leocad.pro b/leocad.pro index df74a168..07bb9f05 100644 --- a/leocad.pro +++ b/leocad.pro @@ -170,7 +170,7 @@ macx { DEFINES += LC_DISABLE_UPDATE_CHECK=1 } -SOURCES += common/view.cpp \ +SOURCES += \ common/texfont.cpp \ common/project.cpp \ common/pieceinf.cpp \ @@ -204,6 +204,7 @@ SOURCES += common/view.cpp \ common/lc_synth.cpp \ common/lc_texture.cpp \ common/lc_timelinewidget.cpp \ + common/lc_view.cpp \ common/lc_viewsphere.cpp \ common/lc_viewwidget.cpp \ common/lc_zipfile.cpp \ @@ -233,7 +234,6 @@ SOURCES += common/view.cpp \ qt/lc_setsdatabasedialog.cpp \ common/lc_partpalettedialog.cpp HEADERS += \ - common/view.h \ common/texfont.h \ common/project.h \ common/pieceinf.h \ @@ -269,6 +269,7 @@ HEADERS += \ common/lc_stringcache.h \ common/lc_synth.h \ common/lc_texture.h \ + common/lc_view.h \ common/lc_viewsphere.h \ common/lc_viewwidget.h \ common/lc_zipfile.h \ diff --git a/qt/lc_qaboutdialog.cpp b/qt/lc_qaboutdialog.cpp index 1dc56a68..bafac224 100644 --- a/qt/lc_qaboutdialog.cpp +++ b/qt/lc_qaboutdialog.cpp @@ -2,7 +2,7 @@ #include "lc_qaboutdialog.h" #include "ui_lc_qaboutdialog.h" #include "lc_mainwindow.h" -#include "view.h" +#include "lc_view.h" #include "lc_glextensions.h" lcQAboutDialog::lcQAboutDialog(QWidget *parent) :