r19965 by jghali - fix errors when building shapeplugin on Windows

[scribus-commit]

Author: jghali
Date: Sat Apr  4 09:59:24 2015
New Revision: 19965

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19965
Log:
fix errors when building shapeplugin on Windows

Modified:
    trunk/Scribus/scribus/plugins/shapes/shapepalette.h
    trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp

Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19965&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.h
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.h (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.h Sat Apr  4 09:59:24 2015
@@ -39,12 +39,12 @@
 class ShapePalette;
 
 
-#include "scribusapi.h"
+#include "pluginapi.h"
 #include "ui/scdockpalette.h"
 #include "ui/sclistwidgetdelegate.h"
 #include "fpointarray.h"
 
-class SCRIBUS_API ShapeView : public QListWidget
+class PLUGIN_API ShapeView : public QListWidget
 {
 	Q_OBJECT
 
@@ -74,7 +74,7 @@
 	ScListWidgetDelegate* delegate;
 };
 
-class SCRIBUS_API ShapePalette : public ScDockPalette
+class PLUGIN_API ShapePalette : public ScDockPalette
 {
 	Q_OBJECT
 

Modified: trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19965&path=/trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp Sat Apr  4 09:59:24 2015
@@ -21,14 +21,16 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QApplication>
+#include <QWidget>
+#include <QString>
+
 #include "scribuscore.h"
 #include "scribusapp.h"
 #include "shapeplugin.h"
 #include "scraction.h"
 #include "ui/scmwmenumanager.h"
-#include <QApplication>
-#include <QWidget>
-#include <QString>
+
 
 int shapeplugin_getPluginAPIVersion()
 {