r23361 by jghali - #15937: ui/newfile.h name does not match name of class

scribus-commit scribus-commit at lists.scribus.net
Thu Nov 14 12:57:12 UTC 2019 

Author: jghali
Date: Thu Nov 14 12:57:12 2019
New Revision: 23361

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23361
Log:
#15937: ui/newfile.h name does not match name of class

Added:
    trunk/Scribus/scribus/ui/newdocdialog.cpp
      - copied, changed from r23360, trunk/Scribus/scribus/ui/newfile.cpp
    trunk/Scribus/scribus/ui/newdocdialog.h
      - copied, changed from r23360, trunk/Scribus/scribus/ui/newfile.h
Modified:
    trunk/Scribus/Scribus.pro
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/newfile.cpp
    trunk/Scribus/scribus/ui/newfile.h
    trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters

Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23361&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro	(original)
+++ trunk/Scribus/Scribus.pro	Thu Nov 14 12:57:12 2019
@@ -487,7 +487,7 @@
            scribus/ui/movepage.h \
            scribus/ui/multipleduplicate.h \
            scribus/ui/multiprogressdialog.h \
-           scribus/ui/newfile.h \
+           scribus/ui/newdocdialog.h \
            scribus/ui/newmarginwidget.h \
            scribus/ui/newtemp.h \
            scribus/ui/nftdialog.h \
@@ -1613,7 +1613,7 @@
            scribus/ui/movepage.cpp \
            scribus/ui/multipleduplicate.cpp \
            scribus/ui/multiprogressdialog.cpp \
-           scribus/ui/newfile.cpp \
+           scribus/ui/newdocdialog.cpp \
            scribus/ui/newmarginwidget.cpp \
            scribus/ui/newtemp.cpp \
            scribus/ui/nftdialog.cpp \

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23361&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Thu Nov 14 12:57:12 2019
@@ -402,7 +402,7 @@
 	ui/movepage.h
 	ui/multipleduplicate.h
 	ui/multiprogressdialog.h
-	ui/newfile.h
+	ui/newdocdialog.h
 	ui/newtemp.h
 	ui/nftdialog.h
 	ui/nftwidget.h
@@ -903,7 +903,7 @@
 	ui/multipleduplicate.cpp
 	ui/multiprogressdialog.cpp
 	ui/measurements.cpp
-	ui/newfile.cpp
+	ui/newdocdialog.cpp
 	ui/newtemp.cpp
 	ui/nftdialog.cpp
 	ui/nftwidget.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23361&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Thu Nov 14 12:57:12 2019
@@ -203,7 +203,7 @@
 #include "ui/modetoolbar.h"
 #include "ui/movepage.h"
 #include "ui/multipleduplicate.h"
-#include "ui/newfile.h"
+#include "ui/newdocdialog.h"
 #include "ui/newtemp.h"
 #include "ui/nftdialog.h"
 #include "ui/nftwidget.h"
@@ -1933,7 +1933,7 @@
 {
 	//Do not quit if Preferences or new doc window is open
 	PreferencesDialog *prefsDialog = findChild<PreferencesDialog *>(QString::fromLocal8Bit("PreferencesDialog"));
-	NewDoc *newDocWin = findChild<NewDoc *>(QString::fromLocal8Bit("NewDocumentWindow"));
+	NewDocDialog *newDocWin = findChild<NewDocDialog *>(QString::fromLocal8Bit("NewDocumentWindow"));
 	if (prefsDialog!=nullptr || newDocWin!=nullptr)
 	{
 		ce->ignore();
@@ -2107,10 +2107,10 @@
 {
 	bool docSet = false;
 	PrefsContext* docContext = m_prefsManager.prefsFile->getContext("docdirs", false);
-	NewDoc* dia = new NewDoc(this, m_recentDocsList, true, ScCore->getGuiLanguage());
+	NewDocDialog* dia = new NewDocDialog(this, m_recentDocsList, true, ScCore->getGuiLanguage());
 	if (dia->exec())
 	{
-		if (dia->tabSelected() == NewDoc::NewDocumentTab)
+		if (dia->tabSelected() == NewDocDialog::NewDocumentTab)
 		{
 			int facingPages = dia->choosenLayout();
 			int firstPage = dia->firstPage->currentIndex();
@@ -2144,7 +2144,7 @@
 			doc->setModified(false);
 			updateActiveWindowCaption(doc->documentFileName());
 		}
-		else if (dia->tabSelected() == NewDoc::NewFromTemplateTab)
+		else if (dia->tabSelected() == NewDocDialog::NewFromTemplateTab)
 		{
 			QString fileName = QDir::cleanPath(dia->selectedFile());
 			if (!fileName.isEmpty() && loadDoc(fileName))
@@ -2157,7 +2157,7 @@
 				removeRecent(fileName);
 			}
 		}
-		else if (dia->tabSelected() == NewDoc::OpenExistingTab)
+		else if (dia->tabSelected() == NewDocDialog::OpenExistingTab)
 		{
 			QString fileName = dia->selectedFile();
 			if (!fileName.isEmpty())
@@ -2167,7 +2167,7 @@
 				loadDoc(fileName);
 			}
 		}
-		else // NewDoc::OpenRecentTab
+		else // NewDocDialog::OpenRecentTab
 		{
 			QString fileName = dia->selectedFile();
 			if (!fileName.isEmpty())
@@ -2191,7 +2191,7 @@
 		view->requestMode(submodeEndNodeEdit);
 	bool retVal = false;
 	bool docSet = false;
-	NewDoc* dia = new NewDoc(this, m_recentDocsList);
+	NewDocDialog* dia = new NewDocDialog(this, m_recentDocsList);
 	if (dia->exec())
 	{
 		int facingPages = dia->choosenLayout();

Modified: trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23361&path=/trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj	Thu Nov 14 12:57:12 2019
@@ -488,7 +488,7 @@
     <moc Include="..\..\..\scribus\ui\multipleduplicate.h" />
     <moc Include="..\..\..\scribus\ui\multiprogressdialog.h" />
     <moc Include="..\..\..\scribus\navigator.h" />
-    <moc Include="..\..\..\scribus\ui\newfile.h" />
+    <moc Include="..\..\..\scribus\ui\newdocdialog.h" />
     <moc Include="..\..\..\scribus\ui\newmarginwidget.h" />
     <moc Include="..\..\..\scribus\ui\newtemp.h" />
     <moc Include="..\..\..\scribus\ui\nftdialog.h" />
@@ -1163,7 +1163,7 @@
     <ClCompile Include="..\..\..\scribus\ui\multipleduplicate.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\multiprogressdialog.cpp" />
     <ClCompile Include="..\..\..\scribus\navigator.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\newfile.cpp" />
+    <ClCompile Include="..\..\..\scribus\ui\newdocdialog.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\newmarginwidget.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\newtemp.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\nftdialog.cpp" />

Modified: trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23361&path=/trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters	Thu Nov 14 12:57:12 2019
@@ -1345,7 +1345,7 @@
     <ClCompile Include="..\..\..\scribus\navigator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\newfile.cpp">
+    <ClCompile Include="..\..\..\scribus\ui\newdocdialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\newmarginwidget.cpp">
@@ -3431,7 +3431,7 @@
     <moc Include="..\..\..\scribus\navigator.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\newfile.h">
+    <moc Include="..\..\..\scribus\ui\newdocdialog.h">
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\newmarginwidget.h">

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23361&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	Thu Nov 14 12:57:12 2019
@@ -488,7 +488,7 @@
     <moc Include="..\..\..\scribus\ui\multipleduplicate.h" />
     <moc Include="..\..\..\scribus\ui\multiprogressdialog.h" />
     <moc Include="..\..\..\scribus\navigator.h" />
-    <moc Include="..\..\..\scribus\ui\newfile.h" />
+    <moc Include="..\..\..\scribus\ui\newdocdialog.h" />
     <moc Include="..\..\..\scribus\ui\newmarginwidget.h" />
     <moc Include="..\..\..\scribus\ui\newtemp.h" />
     <moc Include="..\..\..\scribus\ui\nftdialog.h" />
@@ -1163,7 +1163,7 @@
     <ClCompile Include="..\..\..\scribus\ui\multipleduplicate.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\multiprogressdialog.cpp" />
     <ClCompile Include="..\..\..\scribus\navigator.cpp" />
-    <ClCompile Include="..\..\..\scribus\ui\newfile.cpp" />
+    <ClCompile Include="..\..\..\scribus\ui\newdocdialog.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\newmarginwidget.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\newtemp.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\nftdialog.cpp" />

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23361&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	Thu Nov 14 12:57:12 2019
@@ -1345,7 +1345,7 @@
     <ClCompile Include="..\..\..\scribus\navigator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\ui\newfile.cpp">
+    <ClCompile Include="..\..\..\scribus\ui\newdocdialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\newmarginwidget.cpp">
@@ -3431,7 +3431,7 @@
     <moc Include="..\..\..\scribus\navigator.h">
       <Filter>Header Files</Filter>
     </moc>
-    <moc Include="..\..\..\scribus\ui\newfile.h">
+    <moc Include="..\..\..\scribus\ui\newdocdialog.h">
       <Filter>Header Files</Filter>
     </moc>
     <moc Include="..\..\..\scribus\ui\newmarginwidget.h">

More information about the scribus-commit mailing list