From 4d0eb9ce3eb168d28323110f48a8b1e3370389a7 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 16 Aug 2013 01:20:51 +0000 Subject: [PATCH] Renamed source files. --- common/lc_application.cpp | 2 +- common/{basewnd.h => lc_basewnd.h} | 6 +++--- common/lc_library.cpp | 2 +- common/{mainwnd.cpp => lc_mainwnd.cpp} | 2 +- common/{mainwnd.h => lc_mainwnd.h} | 8 ++++---- common/opengl.cpp | 2 +- common/preview.cpp | 2 +- common/project.cpp | 2 +- leocad.pro | 10 +++++----- qt/lc_qarraydialog.cpp | 2 +- qt/lc_qeditgroupsdialog.cpp | 2 +- qt/lc_qglwidget.cpp | 2 +- qt/lc_qhtmldialog.cpp | 2 +- qt/lc_qimagedialog.cpp | 2 +- qt/lc_qmainwindow.cpp | 2 +- qt/lc_qminifigdialog.cpp | 2 +- qt/lc_qpovraydialog.cpp | 2 +- qt/lc_qpreferencesdialog.cpp | 2 +- qt/lc_qpropertiesdialog.cpp | 2 +- qt/lc_qselectdialog.cpp | 2 +- qt/qtmain.cpp | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) rename common/{basewnd.h => lc_basewnd.h} (98%) rename common/{mainwnd.cpp => lc_mainwnd.cpp} (98%) rename common/{mainwnd.h => lc_mainwnd.h} (93%) diff --git a/common/lc_application.cpp b/common/lc_application.cpp index 14f5bc83..5103544b 100644 --- a/common/lc_application.cpp +++ b/common/lc_application.cpp @@ -9,7 +9,7 @@ #include "opengl.h" #include "project.h" #include "image.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" #include "lc_shortcuts.h" lcApplication* g_App; diff --git a/common/basewnd.h b/common/lc_basewnd.h similarity index 98% rename from common/basewnd.h rename to common/lc_basewnd.h index c4200ec0..22ec70e9 100644 --- a/common/basewnd.h +++ b/common/lc_basewnd.h @@ -1,5 +1,5 @@ -#ifndef _BASEWND_H_ -#define _BASEWND_H_ +#ifndef _LC_BASEWND_H_ +#define _LC_BASEWND_H_ #include "defines.h" #include "lc_math.h" @@ -185,4 +185,4 @@ class lcBaseWindow void* mHandle; }; -#endif // _BASEWND_H_ +#endif // _LC_BASEWND_H_ diff --git a/common/lc_library.cpp b/common/lc_library.cpp index 7c8e7078..002cbc77 100644 --- a/common/lc_library.cpp +++ b/common/lc_library.cpp @@ -7,7 +7,7 @@ #include "lc_texture.h" #include "lc_category.h" #include "lc_application.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" #include #include #include diff --git a/common/mainwnd.cpp b/common/lc_mainwnd.cpp similarity index 98% rename from common/mainwnd.cpp rename to common/lc_mainwnd.cpp index 4e6cb38b..9bae3ee6 100644 --- a/common/mainwnd.cpp +++ b/common/lc_mainwnd.cpp @@ -1,5 +1,5 @@ #include "lc_global.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" #include "lc_profile.h" #include "preview.h" diff --git a/common/mainwnd.h b/common/lc_mainwnd.h similarity index 93% rename from common/mainwnd.h rename to common/lc_mainwnd.h index 06e0d32b..4bfb3d2d 100644 --- a/common/mainwnd.h +++ b/common/lc_mainwnd.h @@ -1,7 +1,7 @@ -#ifndef _MAINWND_H_ -#define _MAINWND_H_ +#ifndef _LC_MAINWND_H_ +#define _LC_MAINWND_H_ -#include "basewnd.h" +#include "lc_basewnd.h" #include "lc_array.h" class Object; @@ -57,4 +57,4 @@ class lcMainWindow : public lcBaseWindow extern class lcMainWindow* gMainWindow; -#endif // _MAINWND_H_ +#endif // _LC_MAINWND_H_ diff --git a/common/opengl.cpp b/common/opengl.cpp index e73ab956..ac7ef429 100644 --- a/common/opengl.cpp +++ b/common/opengl.cpp @@ -3,7 +3,7 @@ #include #include "opengl.h" #include "lc_glwidget.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" #include "preview.h" GLBINDBUFFERARBPROC lcBindBufferARB; diff --git a/common/preview.cpp b/common/preview.cpp index 2ffacf09..18f46a50 100644 --- a/common/preview.cpp +++ b/common/preview.cpp @@ -4,7 +4,7 @@ #include "pieceinf.h" #include "system.h" #include "lc_application.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" PiecePreview::PiecePreview() { diff --git a/common/project.cpp b/common/project.cpp index 05abfacc..1da9e598 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -24,7 +24,7 @@ #include "console.h" #include "minifig.h" #include "curve.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" #include "view.h" #include "lc_library.h" #include "texfont.h" diff --git a/leocad.pro b/leocad.pro index 48f98062..69e40f71 100644 --- a/leocad.pro +++ b/leocad.pro @@ -91,7 +91,6 @@ SOURCES += common/view.cpp \ common/opengl.cpp \ common/object.cpp \ common/minifig.cpp \ - common/mainwnd.cpp \ common/light.cpp \ common/lc_zipfile.cpp \ common/lc_texture.cpp \ @@ -135,7 +134,8 @@ SOURCES += common/view.cpp \ qt/lc_qimage.cpp \ qt/lc_qglwidget.cpp \ qt/lc_qcolorlist.cpp \ - qt/lc_qfinddialog.cpp + qt/lc_qfinddialog.cpp \ + common/lc_mainwnd.cpp HEADERS += \ common/view.h \ common/tr.h \ @@ -150,7 +150,6 @@ HEADERS += \ common/opengl.h \ common/object.h \ common/minifig.h \ - common/mainwnd.h \ common/light.h \ common/lc_zipfile.h \ common/lc_texture.h \ @@ -168,7 +167,6 @@ HEADERS += \ common/curve.h \ common/console.h \ common/camera.h \ - common/basewnd.h \ common/lc_profile.h \ common/lc_category.h \ qt/lc_qmainwindow.h \ @@ -196,7 +194,9 @@ HEADERS += \ qt/lc_qcolorlist.h \ common/lc_glwidget.h \ qt/lc_qfinddialog.h \ - common/lc_array.h + common/lc_array.h \ + common/lc_mainwnd.h \ + common/lc_basewnd.h FORMS += \ qt/lc_qpovraydialog.ui \ qt/lc_qarraydialog.ui \ diff --git a/qt/lc_qarraydialog.cpp b/qt/lc_qarraydialog.cpp index c6655cb9..f5e1e56c 100644 --- a/qt/lc_qarraydialog.cpp +++ b/qt/lc_qarraydialog.cpp @@ -1,7 +1,7 @@ #include "lc_global.h" #include "lc_qarraydialog.h" #include "ui_lc_qarraydialog.h" -#include "basewnd.h" +#include "lc_basewnd.h" lcQArrayDialog::lcQArrayDialog(QWidget *parent, void *data) : QDialog(parent), diff --git a/qt/lc_qeditgroupsdialog.cpp b/qt/lc_qeditgroupsdialog.cpp index 78186cc7..dadd31dd 100644 --- a/qt/lc_qeditgroupsdialog.cpp +++ b/qt/lc_qeditgroupsdialog.cpp @@ -5,7 +5,7 @@ #include "project.h" #include "piece.h" #include "group.h" -#include "basewnd.h" +#include "lc_basewnd.h" lcQEditGroupsDialog::lcQEditGroupsDialog(QWidget *parent, void *data) : QDialog(parent), diff --git a/qt/lc_qglwidget.cpp b/qt/lc_qglwidget.cpp index 74aa0314..e956b566 100644 --- a/qt/lc_qglwidget.cpp +++ b/qt/lc_qglwidget.cpp @@ -5,7 +5,7 @@ #include "lc_library.h" #include "lc_application.h" #include "lc_qmainwindow.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" void lcGLWidget::MakeCurrent() { diff --git a/qt/lc_qhtmldialog.cpp b/qt/lc_qhtmldialog.cpp index 67c2b944..c0a6053d 100644 --- a/qt/lc_qhtmldialog.cpp +++ b/qt/lc_qhtmldialog.cpp @@ -1,7 +1,7 @@ #include "lc_global.h" #include "lc_qhtmldialog.h" #include "ui_lc_qhtmldialog.h" -#include "basewnd.h" +#include "lc_basewnd.h" lcQHTMLDialog::lcQHTMLDialog(QWidget *parent, void *data) : QDialog(parent), diff --git a/qt/lc_qimagedialog.cpp b/qt/lc_qimagedialog.cpp index 3b7b076c..2c253962 100644 --- a/qt/lc_qimagedialog.cpp +++ b/qt/lc_qimagedialog.cpp @@ -1,7 +1,7 @@ #include "lc_global.h" #include "lc_qimagedialog.h" #include "ui_lc_qimagedialog.h" -#include "basewnd.h" +#include "lc_basewnd.h" lcQImageDialog::lcQImageDialog(QWidget *parent, void *data) : QDialog(parent), diff --git a/qt/lc_qmainwindow.cpp b/qt/lc_qmainwindow.cpp index 2606e27f..5d5b64d3 100644 --- a/qt/lc_qmainwindow.cpp +++ b/qt/lc_qmainwindow.cpp @@ -18,7 +18,7 @@ #include "lc_qpropertiestree.h" #include "lc_shortcuts.h" #include "system.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" #include "lc_profile.h" lcQMainWindow::lcQMainWindow(QWidget *parent) diff --git a/qt/lc_qminifigdialog.cpp b/qt/lc_qminifigdialog.cpp index 4763074d..31640f28 100644 --- a/qt/lc_qminifigdialog.cpp +++ b/qt/lc_qminifigdialog.cpp @@ -4,7 +4,7 @@ #include "lc_qglwidget.h" #include "lc_qcolorpicker.h" #include "minifig.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" #include "preview.h" lcQMinifigDialog::lcQMinifigDialog(QWidget *parent, void *data) : diff --git a/qt/lc_qpovraydialog.cpp b/qt/lc_qpovraydialog.cpp index aadfd632..279017d9 100644 --- a/qt/lc_qpovraydialog.cpp +++ b/qt/lc_qpovraydialog.cpp @@ -1,7 +1,7 @@ #include "lc_global.h" #include "lc_qpovraydialog.h" #include "ui_lc_qpovraydialog.h" -#include "basewnd.h" +#include "lc_basewnd.h" lcQPOVRayDialog::lcQPOVRayDialog(QWidget *parent, void *data) : QDialog(parent), diff --git a/qt/lc_qpreferencesdialog.cpp b/qt/lc_qpreferencesdialog.cpp index 72c532c2..ead73dad 100644 --- a/qt/lc_qpreferencesdialog.cpp +++ b/qt/lc_qpreferencesdialog.cpp @@ -3,7 +3,7 @@ #include "ui_lc_qpreferencesdialog.h" #include "lc_qutils.h" #include "lc_qcategorydialog.h" -#include "basewnd.h" +#include "lc_basewnd.h" #include "lc_library.h" #include "lc_application.h" #include "pieceinf.h" diff --git a/qt/lc_qpropertiesdialog.cpp b/qt/lc_qpropertiesdialog.cpp index d5ec7be4..8fb3457c 100644 --- a/qt/lc_qpropertiesdialog.cpp +++ b/qt/lc_qpropertiesdialog.cpp @@ -1,7 +1,7 @@ #include "lc_global.h" #include "lc_qpropertiesdialog.h" #include "ui_lc_qpropertiesdialog.h" -#include "basewnd.h" +#include "lc_basewnd.h" #include "lc_colors.h" #include "lc_library.h" #include "lc_application.h" diff --git a/qt/lc_qselectdialog.cpp b/qt/lc_qselectdialog.cpp index bf7e8bac..79190a73 100644 --- a/qt/lc_qselectdialog.cpp +++ b/qt/lc_qselectdialog.cpp @@ -7,7 +7,7 @@ #include "camera.h" #include "light.h" #include "group.h" -#include "basewnd.h" +#include "lc_basewnd.h" lcQSelectDialog::lcQSelectDialog(QWidget *parent, void *data) : QDialog(parent), diff --git a/qt/qtmain.cpp b/qt/qtmain.cpp index 936aeb25..1005d08d 100644 --- a/qt/qtmain.cpp +++ b/qt/qtmain.cpp @@ -2,7 +2,7 @@ #include "lc_application.h" #include "lc_qmainwindow.h" #include "lc_qupdatedialog.h" -#include "mainwnd.h" +#include "lc_mainwnd.h" #include #ifdef Q_OS_WIN