From kde-commits Mon Nov 30 23:47:41 2015 From: Tomaz Canabrava Date: Mon, 30 Nov 2015 23:47:41 +0000 To: kde-commits Subject: [brprint3d] /: Rename Windows to Dialogs Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=144892727319955 Git commit 2a8b5bce663509a868921022dbaf74663a398c1b by Tomaz Canabrava. Committed on 30/11/2015 at 22:47. Pushed by tcanabrava into branch 'master'. Rename Windows to Dialogs Windows is an operating system, don't confuse the programmers. Signed-off-by: Tomaz Canabrava M +6 -6 CMakeLists.txt R +0 -0 Dialogs/aboutbrprint.cpp [from: Windows/aboutbrprint.cpp - 1= 00% similarity] R +0 -0 Dialogs/aboutbrprint.h [from: Windows/aboutbrprint.h - 100% = similarity] R +0 -0 Dialogs/aboutbrprint.ui [from: Windows/aboutbrprint.ui - 100= % similarity] R +0 -0 Dialogs/documentation.cpp [from: Windows/documentation.cpp -= 100% similarity] R +0 -0 Dialogs/documentation.h [from: Windows/documentation.h - 100= % similarity] R +0 -0 Dialogs/documentation.ui [from: Windows/documentation.ui - 1= 00% similarity] R +0 -0 Dialogs/help.cpp [from: Windows/help.cpp - 100% similarity] R +0 -0 Dialogs/help.h [from: Windows/help.h - 100% similarity] R +0 -0 Dialogs/help.ui [from: Windows/help.ui - 100% similarity] R +0 -0 Dialogs/legalwarning.cpp [from: Windows/legalwarning.cpp - 1= 00% similarity] R +0 -0 Dialogs/legalwarning.h [from: Windows/legalwarning.h - 100% = similarity] R +0 -0 Dialogs/legalwarning.ui [from: Windows/legalwarning.ui - 100= % similarity] R +0 -0 Dialogs/loading.cpp [from: Windows/loading.cpp - 100% simila= rity] R +0 -0 Dialogs/loading.h [from: Windows/loading.h - 100% similarity] R +0 -0 Dialogs/loading.ui [from: Windows/loading.ui - 100% similari= ty] R +0 -0 Dialogs/warning.cpp [from: Windows/warning.cpp - 100% simila= rity] R +0 -0 Dialogs/warning.h [from: Windows/warning.h - 100% similarity] R +0 -0 Dialogs/warning.ui [from: Windows/warning.ui - 100% similari= ty] M +5 -5 brprint3d.h M +1 -1 main.cpp http://commits.kde.org/brprint3d/2a8b5bce663509a868921022dbaf74663a398c1b diff --git a/CMakeLists.txt b/CMakeLists.txt index 09c3334..8eb9df5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,12 +30,12 @@ set(KI_SRCS add_library(KI STATIC ${KI_SRCS}) = set(Dialogs_SRCS - Windows/aboutbrprint.cpp - Windows/documentation.cpp - Windows/help.cpp - Windows/legalwarning.cpp - Windows/loading.cpp - Windows/warning.cpp + Dialogs/aboutbrprint.cpp + Dialogs/documentation.cpp + Dialogs/help.cpp + Dialogs/legalwarning.cpp + Dialogs/loading.cpp + Dialogs/warning.cpp ) add_library(BRPrintDialogs STATIC ${Dialogs_SRCS}) target_link_libraries(BRPrintDialogs Qt5::Widgets) diff --git a/Windows/aboutbrprint.cpp b/Dialogs/aboutbrprint.cpp similarity index 100% rename from Windows/aboutbrprint.cpp rename to Dialogs/aboutbrprint.cpp diff --git a/Windows/aboutbrprint.h b/Dialogs/aboutbrprint.h similarity index 100% rename from Windows/aboutbrprint.h rename to Dialogs/aboutbrprint.h diff --git a/Windows/aboutbrprint.ui b/Dialogs/aboutbrprint.ui similarity index 100% rename from Windows/aboutbrprint.ui rename to Dialogs/aboutbrprint.ui diff --git a/Windows/documentation.cpp b/Dialogs/documentation.cpp similarity index 100% rename from Windows/documentation.cpp rename to Dialogs/documentation.cpp diff --git a/Windows/documentation.h b/Dialogs/documentation.h similarity index 100% rename from Windows/documentation.h rename to Dialogs/documentation.h diff --git a/Windows/documentation.ui b/Dialogs/documentation.ui similarity index 100% rename from Windows/documentation.ui rename to Dialogs/documentation.ui diff --git a/Windows/help.cpp b/Dialogs/help.cpp similarity index 100% rename from Windows/help.cpp rename to Dialogs/help.cpp diff --git a/Windows/help.h b/Dialogs/help.h similarity index 100% rename from Windows/help.h rename to Dialogs/help.h diff --git a/Windows/help.ui b/Dialogs/help.ui similarity index 100% rename from Windows/help.ui rename to Dialogs/help.ui diff --git a/Windows/legalwarning.cpp b/Dialogs/legalwarning.cpp similarity index 100% rename from Windows/legalwarning.cpp rename to Dialogs/legalwarning.cpp diff --git a/Windows/legalwarning.h b/Dialogs/legalwarning.h similarity index 100% rename from Windows/legalwarning.h rename to Dialogs/legalwarning.h diff --git a/Windows/legalwarning.ui b/Dialogs/legalwarning.ui similarity index 100% rename from Windows/legalwarning.ui rename to Dialogs/legalwarning.ui diff --git a/Windows/loading.cpp b/Dialogs/loading.cpp similarity index 100% rename from Windows/loading.cpp rename to Dialogs/loading.cpp diff --git a/Windows/loading.h b/Dialogs/loading.h similarity index 100% rename from Windows/loading.h rename to Dialogs/loading.h diff --git a/Windows/loading.ui b/Dialogs/loading.ui similarity index 100% rename from Windows/loading.ui rename to Dialogs/loading.ui diff --git a/Windows/warning.cpp b/Dialogs/warning.cpp similarity index 100% rename from Windows/warning.cpp rename to Dialogs/warning.cpp diff --git a/Windows/warning.h b/Dialogs/warning.h similarity index 100% rename from Windows/warning.h rename to Dialogs/warning.h diff --git a/Windows/warning.ui b/Dialogs/warning.ui similarity index 100% rename from Windows/warning.ui rename to Dialogs/warning.ui diff --git a/brprint3d.h b/brprint3d.h index 0e6cfa1..1d1bc68 100755 --- a/brprint3d.h +++ b/brprint3d.h @@ -24,11 +24,11 @@ #ifndef BRPRINT3D_H #define BRPRINT3D_H #include -#include -#include -#include -#include -#include +#include "Dialogs/loading.h" +#include "Dialogs/documentation.h" +#include "Dialogs/aboutbrprint.h" +#include "Dialogs/help.h" +#include "Dialogs/legalwarning.h" #include "KI/Repetier.h" #include "vtkWidget.h" #include "PrinterSettings.h" diff --git a/main.cpp b/main.cpp index 7ec543b..336fe67 100755 --- a/main.cpp +++ b/main.cpp @@ -23,7 +23,7 @@ = #include "brprint3d.h" #include -#include +#include "Dialogs/loading.h" #include #include #include