r20279 by jghali - #13249: fix a couple of warnings when running lupdate

[scribus-commit]

Author: jghali
Date: Sun Jul 26 22:29:58 2015
New Revision: 20279

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20279
Log:
#13249: fix a couple of warnings when running lupdate

Modified:
    trunk/Scribus/Scribus.pro
    trunk/Scribus/scribus/canvasmode_create.h
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/ui/outlinepalette.h
    trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj

Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20279&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro (original)
+++ trunk/Scribus/Scribus.pro Sun Jul 26 22:29:58 2015
@@ -5,6 +5,7 @@
 TEMPLATE = app
 TARGET = Scribus
 INCLUDEPATH += .
+INCLUDEPATH += ./scribus
 
 # Input
 HEADERS += scribus/actionmanager.h \

Modified: trunk/Scribus/scribus/canvasmode_create.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20279&path=/trunk/Scribus/scribus/canvasmode_create.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.h (original)
+++ trunk/Scribus/scribus/canvasmode_create.h Sun Jul 26 22:29:58 2015
@@ -32,6 +32,8 @@
 */
 class CreateMode : public CanvasMode
 {
+	Q_OBJECT
+
 public:
 	explicit CreateMode(ScribusView* view);
 	virtual ~CreateMode() {}

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20279&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Sun Jul 26 22:29:58 2015
@@ -5828,7 +5828,7 @@
 
 NotesInFrameMap PageItem_TextFrame::updateNotesFrames(QMap<int, Mark*> noteMarksPosMap)
 {
-	NotesInFrameMap notesMap; //= m_notesFramesMap;
+	NotesInFrameMap notesMap; // = m_notesFramesMap;
 	QMap<int, Mark*>::Iterator it = noteMarksPosMap.begin();
 	QMap<int, Mark*>::Iterator end = noteMarksPosMap.end();
 	PageItem* lastItem = this;

Modified: trunk/Scribus/scribus/ui/outlinepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20279&path=/trunk/Scribus/scribus/ui/outlinepalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.h (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.h Sun Jul 26 22:29:58 2015
@@ -39,6 +39,8 @@
 
 class SCRIBUS_API OutlineWidget : public QTreeWidget
 {
+	Q_OBJECT
+
 public:
 	OutlineWidget(QWidget* parent);
 	~OutlineWidget() {};

Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20279&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 Sun Jul 26 22:29:58 2015
@@ -293,7 +293,7 @@
     <moc Include="..\..\..\scribus\canvasgesture_tableresize.h" />
     <moc Include="..\..\..\scribus\canvasmode.h" />
     <ClInclude Include="..\..\..\scribus\canvasmode_copyproperties.h" />
-    <ClInclude Include="..\..\..\scribus\canvasmode_create.h" />
+    <moc Include="..\..\..\scribus\canvasmode_create.h" />
     <ClInclude Include="..\..\..\scribus\canvasmode_drawbezier.h" />
     <ClInclude Include="..\..\..\scribus\canvasmode_drawcalligraphic.h" />
     <ClInclude Include="..\..\..\scribus\canvasmode_drawfreehand.h" />