r21946 by craig - Re-add Q_OBJECT to 3 classes and fix build setup

[scribus-commit]

Author: craig
Date: Fri Apr 21 09:27:06 2017
New Revision: 21946

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21946
Log:
Re-add Q_OBJECT to 3 classes and fix build setup

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/canvasmode_imageimport.h
    trunk/Scribus/scribus/canvasmode_normal.h
    trunk/Scribus/scribus/canvasmode_objimport.cpp
    trunk/Scribus/scribus/canvasmode_objimport.h
    trunk/Scribus/scribus/ui/sccombobox.h

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21946&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Fri Apr 21 09:27:06 2017
@@ -232,8 +232,10 @@
 	canvasmode_editweldpoint.h
 	canvasmode_eyedropper.h
 	canvasmode_framelinks.h
+	canvasmode_imageimport.h
 	canvasmode_measurements.h
 	canvasmode_normal.h
+	canvasmode_objimport.h
 	chartablemodel.h
 	chartableview.h
 	collect4output.h
@@ -477,6 +479,7 @@
 	ui/resourcemanagerlicense.h
 	ui/rulermover.h
 	ui/sccolorslider.h
+	ui/sccombobox.h
 	ui/scdockpalette.h
 	ui/scescapecatcher.h
 	ui/scfilewidget.h

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

Modified: trunk/Scribus/scribus/canvasmode_normal.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21946&path=/trunk/Scribus/scribus/canvasmode_normal.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.h	(original)
+++ trunk/Scribus/scribus/canvasmode_normal.h	Fri Apr 21 09:27:06 2017
@@ -15,8 +15,8 @@
 
 
 
-#ifndef CANVAS_MODE_NORMAL_H
-#define CANVAS_MODE_NORMAL_H
+#ifndef CANVASMODE_NORMAL_H
+#define CANVASMODE_NORMAL_H
 
 #include <QObject>
 #include <QTime>

Modified: trunk/Scribus/scribus/canvasmode_objimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21946&path=/trunk/Scribus/scribus/canvasmode_objimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_objimport.cpp	Fri Apr 21 09:27:06 2017
@@ -19,11 +19,8 @@
 #include <QApplication>
 #include <QCursor>
 #include <QDropEvent>
-#include <QEvent>
-#include <QMouseEvent>
 #include <QPoint>
 #include <QRect>
-#include <QMimeData>
 #include <QDebug>
 
 #include "appmodes.h"

Modified: trunk/Scribus/scribus/canvasmode_objimport.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21946&path=/trunk/Scribus/scribus/canvasmode_objimport.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.h	(original)
+++ trunk/Scribus/scribus/canvasmode_objimport.h	Fri Apr 21 09:27:06 2017
@@ -13,12 +13,14 @@
 *                                                                         *
 ***************************************************************************/
 
+#ifndef CANVASMODE_OBJIMPORT_H
+#define CANVASMODE_OBJIMPORT_H
 
-
-#ifndef CANVAS_MODE_OBJIMPORT_H
-#define CANVAS_MODE_OBJIMPORT_H
-
+#include <QEvent>
+#include <QMimeData>
+#include <QMouseEvent>
 #include <QObject>
+#include <QPainter>
 
 #include "canvasmode.h"
 #include "fpointarray.h"
@@ -34,6 +36,8 @@
 
 class CanvasMode_ObjImport :  public CanvasMode
 {
+	Q_OBJECT
+
 public:
 	explicit CanvasMode_ObjImport(ScribusView* view);
 	virtual ~CanvasMode_ObjImport();
@@ -56,9 +60,9 @@
 // 	void setResizeCursor(int);
 
 private:
-	QMimeData*          m_mimeData;
+	QMimeData* m_mimeData;
 	TransactionSettings* m_trSettings;
-	double     m_Mxp, m_Myp;
+	double m_Mxp, m_Myp;
 };
 
 

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