r21944 by craig - Fix some moc/Q_OBJECT issues

scribus-commit scribus-commit at lists.scribus.net
Fri Apr 21 07:08:18 UTC 2017


Author: craig
Date: Fri Apr 21 07:08:18 2017
New Revision: 21944

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21944
Log:
Fix some moc/Q_OBJECT issues

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/canvasgesture.h
    trunk/Scribus/scribus/canvasmode_imageimport.h
    trunk/Scribus/scribus/canvasmode_objimport.h
    trunk/Scribus/scribus/pageitem_table.h
    trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
    trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
    trunk/Scribus/scribus/ui/sccombobox.h

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21944&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Fri Apr 21 07:08:18 2017
@@ -288,6 +288,7 @@
 	scimagecachedir.h
 	scimagecachefile.h
 	scimagecachemanager.h
+	scmimedata.h
 	scplugin.h
 	scprintengine.h
 	scraction.h
@@ -360,6 +361,7 @@
 	ui/gtfiledialog.h
 	ui/guidemanager.h
 	ui/helpbrowser.h
+	ui/helpnavigation.h
 	ui/hruler.h
 	ui/hyask.h
 	ui/imageinfodialog.h
@@ -372,6 +374,8 @@
 	ui/javadocs.h
 	ui/latexeditor.h
 	ui/layers.h
+	ui/linecombo.h
+	ui/linkbutton.h
 	ui/loremipsum.h
 	ui/markinsert.h
 	ui/mark2item.h
@@ -472,6 +476,7 @@
 	ui/resourcemanager.h
 	ui/resourcemanagerlicense.h
 	ui/rulermover.h
+	ui/sccolorslider.h
 	ui/scdockpalette.h
 	ui/scescapecatcher.h
 	ui/scfilewidget.h
@@ -505,6 +510,7 @@
 	ui/smlinestyle.h
 	ui/smlinestylewidget.h
 	ui/smpstylewidget.h
+	ui/smradiobutton.h
 	ui/smreplacedia.h
 	ui/smsccombobox.h
 	ui/smscrspinbox.h
@@ -519,6 +525,7 @@
 	ui/spalette.h
 	ui/spiralvectordialog.h
 	ui/spiralwidget.h
+	ui/splash.h
 	ui/storyeditor.h
 	ui/stylemanager.h
 	ui/styleselect.h

Modified: trunk/Scribus/scribus/canvasgesture.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21944&path=/trunk/Scribus/scribus/canvasgesture.h
==============================================================================
--- trunk/Scribus/scribus/canvasgesture.h	(original)
+++ trunk/Scribus/scribus/canvasgesture.h	Fri Apr 21 07:08:18 2017
@@ -46,7 +46,6 @@
  */
 class SCRIBUS_API CanvasGesture : public CanvasMode
 {
-	Q_OBJECT
 
 protected:
 	explicit CanvasGesture (CanvasMode* parent) : CanvasMode(parent->view()), m_delegate(parent) {};

Modified: trunk/Scribus/scribus/canvasmode_imageimport.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21944&path=/trunk/Scribus/scribus/canvasmode_imageimport.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.h	(original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.h	Fri Apr 21 07:08:18 2017
@@ -31,8 +31,6 @@
 
 class CanvasMode_ImageImport : public CanvasMode
 {
-	Q_OBJECT
-
 public:
 	explicit CanvasMode_ImageImport(ScribusView* view);
 	virtual ~CanvasMode_ImageImport() {}

Modified: trunk/Scribus/scribus/canvasmode_objimport.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21944&path=/trunk/Scribus/scribus/canvasmode_objimport.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.h	(original)
+++ trunk/Scribus/scribus/canvasmode_objimport.h	Fri Apr 21 07:08:18 2017
@@ -34,8 +34,6 @@
 
 class CanvasMode_ObjImport :  public CanvasMode
 {
-	Q_OBJECT
-
 public:
 	explicit CanvasMode_ObjImport(ScribusView* view);
 	virtual ~CanvasMode_ObjImport();

Modified: trunk/Scribus/scribus/pageitem_table.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21944&path=/trunk/Scribus/scribus/pageitem_table.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_table.h	(original)
+++ trunk/Scribus/scribus/pageitem_table.h	Fri Apr 21 07:08:18 2017
@@ -49,7 +49,6 @@
 class SCRIBUS_API PageItem_Table : public PageItem
 {
 	Q_OBJECT
-	Q_ENUMS(ResizeStrategy HitTarget)
 
 	Q_PROPERTY(int rows READ rows NOTIFY changed)
 	Q_PROPERTY(int columns READ columns NOTIFY changed)
@@ -79,6 +78,8 @@
 
 	/// The minimum column width.
 	static const double MinimumColumnWidth;
+
+	Q_ENUM(ResizeStrategy HitTarget)
 
 public:
 	/// Construct a new table item with @a numRows rows and @a numColumns columns.

Modified: trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21944&path=/trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt	Fri Apr 21 07:08:18 2017
@@ -12,10 +12,12 @@
 	collection.h
 	findimage.h
 	imagedialog.h
+	iview.h
 	loadimage.h
 	multicombobox.h
 	picturebrowserplugin.h
 	picturebrowser.h
+	pictview.h
 	previewimage.h
 )
 

Modified: trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21944&path=/trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt	Fri Apr 21 07:08:18 2017
@@ -15,6 +15,7 @@
 	shortwords.h
 	swprefsgui.h
 	swdialog.h
+	swsyntaxhighlighter.h
 )
 
 set(SHORTWORDS_PLUGIN_SOURCES

Modified: trunk/Scribus/scribus/ui/sccombobox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21944&path=/trunk/Scribus/scribus/ui/sccombobox.h
==============================================================================
--- trunk/Scribus/scribus/ui/sccombobox.h	(original)
+++ trunk/Scribus/scribus/ui/sccombobox.h	Fri Apr 21 07:08:18 2017
@@ -25,7 +25,7 @@
 */
 class ScComboBox : public QComboBox
 {
-	Q_OBJECT
+//	Q_OBJECT
 
 public: 
 	ScComboBox( QWidget* parent=0);




More information about the scribus-commit mailing list