r21937 by jghali - fix multiple build errors

scribus-commit scribus-commit at lists.scribus.net
Thu Apr 20 09:32:58 UTC 2017 

Author: jghali
Date: Thu Apr 20 09:32:58 2017
New Revision: 21937

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21937
Log:
fix multiple build errors

Modified:
    trunk/Scribus/scribus/scmimedata.h
    trunk/Scribus/scribus/scpaths.cpp
    trunk/Scribus/scribus/ui/latexeditor.cpp
    trunk/Scribus/win32/vc11/picturebrowser/picturebrowser.vcxproj
    trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/vc11/shortwords/shortwords.vcxproj

Modified: trunk/Scribus/scribus/scmimedata.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21937&path=/trunk/Scribus/scribus/scmimedata.h
==============================================================================
--- trunk/Scribus/scribus/scmimedata.h	(original)
+++ trunk/Scribus/scribus/scmimedata.h	Thu Apr 20 09:32:58 2017
@@ -28,7 +28,6 @@
 
 class SCRIBUS_API ScMimeData
 {
-	Q_OBJECT
 public:
 	static const QString ScribusElemMimeType;
 	static const QString ScribusFragmentMimeType;
@@ -51,6 +50,7 @@
 class SCRIBUS_API ScFragmentMimeData : public QMimeData
 {
 	Q_OBJECT
+
 public:
 	ScFragmentMimeData(void) : QMimeData() {}
 
@@ -61,6 +61,7 @@
 class SCRIBUS_API ScElemMimeData : public QMimeData
 {
 	Q_OBJECT
+
 protected:
 	QString m_scribusElemData;
 	QStringList m_formats;
@@ -80,6 +81,7 @@
 class SCRIBUS_API ScTextMimeData : public QMimeData
 {
 	Q_OBJECT
+
 public:
 	ScTextMimeData(void) : QMimeData() {}
 

Modified: trunk/Scribus/scribus/scpaths.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21937&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp	(original)
+++ trunk/Scribus/scribus/scpaths.cpp	Thu Apr 20 09:32:58 2017
@@ -290,7 +290,7 @@
 	}
 
 #elif defined(_WIN32)
-//	QString windowsLOPath("LibreOffice 3.5/share/extensions");
+	QString windowsLOPath("LibreOffice 3.5/share/extensions");
 	QString progFiles = windowsSpecialDir(CSIDL_PROGRAM_FILES);
 	d.setPath(progFiles+windowsLOPath);
 	if (d.exists())

Modified: trunk/Scribus/scribus/ui/latexeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21937&path=/trunk/Scribus/scribus/ui/latexeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/latexeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/latexeditor.cpp	Thu Apr 20 09:32:58 2017
@@ -614,7 +614,6 @@
 
 class SCRIBUS_API XmlFontComboBox : public XmlWidget, public QFontComboBox
 {
-	Q_OBJECT
 	public:
 		XmlFontComboBox(I18nXmlStreamReader *xml) : XmlWidget(xml), QFontComboBox()
 		{
@@ -634,7 +633,6 @@
 
 class SCRIBUS_API XmlSpinBox : public XmlWidget, public QSpinBox
 {
-	Q_OBJECT
 	public:
 		XmlSpinBox(I18nXmlStreamReader *xml) :  XmlWidget(xml, false), QSpinBox() {
 			setRange(
@@ -666,7 +664,6 @@
 
 class SCRIBUS_API XmlDoubleSpinBox : public XmlWidget, public QDoubleSpinBox
 {
-	Q_OBJECT
 	public:
 		XmlDoubleSpinBox(I18nXmlStreamReader *xml) :
 			XmlWidget(xml, false), QDoubleSpinBox() {
@@ -700,7 +697,6 @@
 
 class SCRIBUS_API XmlLineEdit : public XmlWidget, public QLineEdit
 {
-	Q_OBJECT
 	public:
 		XmlLineEdit(I18nXmlStreamReader *xml) :  XmlWidget(xml), QLineEdit() {
 			fromString(m_defaultValue);
@@ -717,7 +713,6 @@
 
 class SCRIBUS_API XmlTextEdit : public XmlWidget, public QTextEdit
 {
-	Q_OBJECT
 	public:
 		XmlTextEdit(I18nXmlStreamReader *xml) :  XmlWidget(xml), QTextEdit() {
 			fromString(m_defaultValue);
@@ -734,7 +729,6 @@
 
 class SCRIBUS_API XmlColorPicker : public XmlWidget, public QLabel
 {
-	Q_OBJECT
 	public:
 		XmlColorPicker(I18nXmlStreamReader *xml) :  XmlWidget(xml), 
 			QLabel("Color pickers are not implemented yet!") 
@@ -754,7 +748,6 @@
 
 class SCRIBUS_API XmlComboBox : public XmlWidget, public QComboBox
 {
-	Q_OBJECT
 	public:
 		XmlComboBox(I18nXmlStreamReader *xml) :  XmlWidget(xml, false), QComboBox() 
 		{

Modified: trunk/Scribus/win32/vc11/picturebrowser/picturebrowser.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21937&path=/trunk/Scribus/win32/vc11/picturebrowser/picturebrowser.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/picturebrowser/picturebrowser.vcxproj	(original)
+++ trunk/Scribus/win32/vc11/picturebrowser/picturebrowser.vcxproj	Thu Apr 20 09:32:58 2017
@@ -225,12 +225,12 @@
     <moc Include="..\..\..\scribus\plugins\picbrowser\collection.h" />
     <moc Include="..\..\..\scribus\plugins\picbrowser\findimage.h" />
     <moc Include="..\..\..\scribus\plugins\picbrowser\imagedialog.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\iview.h" />
+    <moc Include="..\..\..\scribus\plugins\picbrowser\iview.h" />
     <moc Include="..\..\..\scribus\plugins\picbrowser\loadimage.h" />
     <moc Include="..\..\..\scribus\plugins\picbrowser\multicombobox.h" />
     <moc Include="..\..\..\scribus\plugins\picbrowser\picturebrowser.h" />
     <moc Include="..\..\..\scribus\plugins\picbrowser\picturebrowserplugin.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\pictview.h" />
+    <moc Include="..\..\..\scribus\plugins\picbrowser\pictview.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\picbrowser\previewimage.h" />
     <ClInclude Include="..\..\..\scribus\plugins\picbrowser\ui_imagedialog.h" />

Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21937&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj	Thu Apr 20 09:32:58 2017
@@ -278,7 +278,7 @@
     <moc Include="..\..\..\scribus\ui\bookmwin.h" />
     <moc Include="..\..\..\scribus\ui\buttonicon.h" />
     <moc Include="..\..\..\scribus\canvas.h" />
-    <ClInclude Include="..\..\..\scribus\canvasgesture.h" />
+    <moc Include="..\..\..\scribus\canvasgesture.h" />
     <moc Include="..\..\..\scribus\canvasgesture_cellselect.h" />
     <moc Include="..\..\..\scribus\canvasgesture_columnresize.h" />
     <ClInclude Include="..\..\..\scribus\canvasgesture_linemove.h" />
@@ -306,12 +306,12 @@
     <moc Include="..\..\..\scribus\canvasmode_editweldpoint.h" />
     <moc Include="..\..\..\scribus\canvasmode_eyedropper.h" />
     <moc Include="..\..\..\scribus\canvasmode_framelinks.h" />
-    <ClInclude Include="..\..\..\scribus\canvasmode_imageimport.h" />
+    <moc Include="..\..\..\scribus\canvasmode_imageimport.h" />
     <ClInclude Include="..\..\..\scribus\canvasmode_magnifier.h" />
     <moc Include="..\..\..\scribus\canvasmode_measurements.h" />
     <ClInclude Include="..\..\..\scribus\canvasmode_nodeedit.h" />
     <moc Include="..\..\..\scribus\canvasmode_normal.h" />
-    <ClInclude Include="..\..\..\scribus\canvasmode_objimport.h" />
+    <moc Include="..\..\..\scribus\canvasmode_objimport.h" />
     <ClInclude Include="..\..\..\scribus\canvasmode_panning.h" />
     <ClInclude Include="..\..\..\scribus\canvasmode_rotate.h" />
     <ClInclude Include="..\..\..\scribus\cellarea.h" />
@@ -417,7 +417,7 @@
     <moc Include="..\..\..\scribus\ui\directionselect.h" />
     <moc Include="..\..\..\scribus\ui\colorlistmodel.h" />
     <moc Include="..\..\..\scribus\ui\colorsandfills.h" />
-    <ClInclude Include="..\..\..\scribus\ui\helpnavigation.h" />
+    <moc Include="..\..\..\scribus\ui\helpnavigation.h" />
     <ClInclude Include="..\..\..\scribus\third_party\hyphen\hnjalloc.h" />
     <moc Include="..\..\..\scribus\ui\hruler.h" />
     <moc Include="..\..\..\scribus\ui\hyask.h" />
@@ -439,7 +439,7 @@
     <moc Include="..\..\..\scribus\ui\layers.h" />
     <moc Include="..\..\..\scribus\ui\linecombo.h" />
     <ClInclude Include="..\..\..\scribus\styles\linestyle.h" />
-    <ClInclude Include="..\..\..\scribus\ui\linkbutton.h" />
+    <moc Include="..\..\..\scribus\ui\linkbutton.h" />
     <moc Include="..\..\..\scribus\loadsaveplugin.h" />
     <ClInclude Include="..\..\..\scribus\localemgr.h" />
     <moc Include="..\..\..\scribus\ui\loremipsum.h" />
@@ -591,7 +591,7 @@
     <moc Include="..\..\..\scribus\ui\recoverdialog.h" />
     <moc Include="..\..\..\scribus\ui\propertywidget_fontfeatures.h" />
     <moc Include="..\..\..\scribus\ui\propertywidget_hyphenation.h" />
-    <ClInclude Include="..\..\..\scribus\ui\sccolorslider.h" />
+    <moc Include="..\..\..\scribus\ui\sccolorslider.h" />
     <moc Include="..\..\..\scribus\ui\smfontfeatures.h" />
     <moc Include="..\..\..\scribus\ui\smlineedit.h" />
     <moc Include="..\..\..\scribus\ui\smdirectionselect.h" />
@@ -611,7 +611,7 @@
     <ClInclude Include="..\..\..\scribus\sccolor.h" />
     <ClInclude Include="..\..\..\scribus\sccolorengine.h" />
     <ClInclude Include="..\..\..\scribus\sccolorshade.h" />
-    <ClInclude Include="..\..\..\scribus\ui\sccombobox.h" />
+    <moc Include="..\..\..\scribus\ui\sccombobox.h" />
     <ClInclude Include="..\..\..\scribus\scconfig.h" />
     <moc Include="..\..\..\scribus\downloadmanager\scdlmgr.h" />
     <moc Include="..\..\..\scribus\downloadmanager\scdlthread.h" />
@@ -655,7 +655,7 @@
     <ClInclude Include="..\..\..\scribus\sclockedfile.h" />
     <moc Include="..\..\..\scribus\ui\scmenu.h" />
     <moc Include="..\..\..\scribus\ui\scmessagebox.h" />
-    <ClInclude Include="..\..\..\scribus\scmimedata.h" />
+    <moc Include="..\..\..\scribus\scmimedata.h" />
     <moc Include="..\..\..\scribus\ui\scmwmenumanager.h" />
     <ClInclude Include="..\..\..\scribus\scpage.h" />
     <ClInclude Include="..\..\..\scribus\scpageoutput.h" />
@@ -735,7 +735,7 @@
     <ClInclude Include="..\..\..\scribus\text\specialchars.h" />
     <moc Include="..\..\..\scribus\ui\spiralvectordialog.h" />
     <moc Include="..\..\..\scribus\ui\spiralwidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\splash.h" />
+    <moc Include="..\..\..\scribus\ui\splash.h" />
     <moc Include="..\..\..\scribus\ui\storyeditor.h" />
     <moc Include="..\..\..\scribus\text\storytext.h" />
     <ClInclude Include="..\..\..\scribus\style.h" />

Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21937&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters	Thu Apr 20 09:32:58 2017
@@ -203,9 +203,6 @@
     <ClInclude Include="..\..\..\scribus\guidemanagercore.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\helpnavigation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\third_party\hyphen\hnjalloc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -224,9 +221,6 @@
     <ClInclude Include="..\..\..\scribus\styles\linestyle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\linkbutton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\localemgr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -308,9 +302,6 @@
     <ClInclude Include="..\..\..\scribus\sccolorshade.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\sccombobox.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\scconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -395,9 +386,6 @@
     <ClInclude Include="..\..\..\scribus\sclockedfile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scmimedata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\scpage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -489,9 +477,6 @@
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\text\specialchars.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\splash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\style.h">
@@ -1016,9 +1001,6 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h">
       <Filter>colorMgmt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\sccolorslider.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerlicensebase.h">
       <Filter>Generated Form Files</Filter>
     </ClInclude>
@@ -1069,9 +1051,6 @@
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\ui\ui_colorsandfillsbase.h">
       <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\colorsandfills.h">
-      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -4217,6 +4196,27 @@
     <moc Include="..\..\..\scribus\ui\pagepropertiesdialog.h">
       <Filter>Header Files</Filter>
     </moc>
+    <moc Include="..\..\..\scribus\ui\colorsandfills.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\ui\helpnavigation.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\ui\linkbutton.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\ui\sccolorslider.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\ui\sccombobox.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\scmimedata.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\ui\splash.h">
+      <Filter>Header Files</Filter>
+    </moc>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\scribus\color.h">

Modified: trunk/Scribus/win32/vc11/shortwords/shortwords.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21937&path=/trunk/Scribus/win32/vc11/shortwords/shortwords.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/shortwords/shortwords.vcxproj	(original)
+++ trunk/Scribus/win32/vc11/shortwords/shortwords.vcxproj	Thu Apr 20 09:32:58 2017
@@ -226,7 +226,7 @@
     <moc Include="..\..\..\scribus\plugins\short-words\swdialog.h" />
     <moc Include="..\..\..\scribus\plugins\short-words\swprefsgui.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h" />
+    <moc Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h" />
     <ClInclude Include="..\..\..\scribus\plugins\short-words\version.h" />
     <ClInclude Include="..\..\..\scribus\plugins\short-words\ui_swdialog.h" />
   </ItemGroup>

More information about the scribus-commit mailing list