r18064 by jghali - msvc project update : speed up compilation of scripter and picture browser by mean of precompiled header + some minor refactoring

scribus-commit scribus-commit at lists.scribus.net
Sun Jan 6 22:06:25 UTC 2013


Author: jghali
Date: Sun Jan  6 22:06:25 2013
New Revision: 18064

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18064
Log:
msvc project update : speed up compilation of scripter and picture browser by mean of precompiled header + some minor refactoring

Added:
    trunk/Scribus/scribus/plugins/plugins_pch.cpp
    trunk/Scribus/scribus/plugins/plugins_pch.h
Modified:
    trunk/Scribus/scribus/plugins/picbrowser/multicombobox.cpp
    trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h
    trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj
    trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj

Modified: trunk/Scribus/scribus/plugins/picbrowser/multicombobox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18064&path=/trunk/Scribus/scribus/plugins/picbrowser/multicombobox.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/multicombobox.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/multicombobox.cpp Sun Jan  6 22:06:25 2013
@@ -1,10 +1,14 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-#include "multicombobox.h"
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+#include "multicombobox.h"
+
+#include <QKeyEvent>
+#include <QObject>
+#include <QWidget>
 
 
 multiComboboxModel::multiComboboxModel ( QObject* parent ) : QStandardItemModel ( parent )

Modified: trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18064&path=/trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/multicombobox.h Sun Jan  6 22:06:25 2013
@@ -1,11 +1,17 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-#include <QtGui>
-
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+#include <QComboBox>
+#include <QListView>
+#include <QStandardItemModel>
+
+class QEvent;
+class QObject;
+class QModelIndex;
+class QWidget;
 class multiCombobox;
 
 class multiComboboxModel : public QStandardItemModel

Modified: trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18064&path=/trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj (original)
+++ trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj Sun Jan  6 22:06:25 2013
@@ -63,11 +63,13 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="plugins_pch.h"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4190;4251;4267;4996"
+				ForcedIncludeFiles="plugins_pch.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -160,11 +162,13 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="plugins_pch.h"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4190;4251;4267;4996"
+				ForcedIncludeFiles="plugins_pch.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -262,6 +266,26 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\scribus\plugins\plugins_pch.cpp"
+				>
+				<FileConfiguration
+					Name="Debug-cairo|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\..\scribus\plugins\picbrowser\previewimage.cpp"
 				>
 			</File>
@@ -402,6 +426,10 @@
 			</File>
 			<File
 				RelativePath="..\..\..\scribus\plugins\picbrowser\pictview.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\plugins_pch.h"
 				>
 			</File>
 			<File

Modified: trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18064&path=/trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj (original)
+++ trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj Sun Jan  6 22:06:25 2013
@@ -63,11 +63,13 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="plugins_pch.h"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4005;4138;4190;4251;4267;4996"
+				ForcedIncludeFiles="plugins_pch.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -160,11 +162,13 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="plugins_pch.h"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4005;4138;4190;4251;4267;4996"
+				ForcedIncludeFiles="plugins_pch.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -302,6 +306,28 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\scribus\plugins\plugins_pch.cpp"
+				>
+				<FileConfiguration
+					Name="Debug-cairo|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+						PrecompiledHeaderThrough="plugins_pch.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+						PrecompiledHeaderThrough="plugins_pch.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\..\scribus\plugins\scriptplugin\prefs_scripter.cpp"
 				>
 			</File>
@@ -433,6 +459,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\..\scribus\plugins\plugins_pch.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\scribus\plugins\scriptplugin\prefs_scripter.h"
 				>
 				<FileConfiguration




More information about the scribus-commit mailing list