r20555 by craig -

[scribus-commit]

Author: craig
Date: Sun Nov 15 20:19:18 2015
New Revision: 20555

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20555
Log:
Move some story editor variables out of public

Modified:
    trunk/Scribus/scribus/ui/storyeditor.h

Modified: trunk/Scribus/scribus/ui/storyeditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20555&path=/trunk/Scribus/scribus/ui/storyeditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.h	(original)
+++ trunk/Scribus/scribus/ui/storyeditor.h	Sun Nov 15 20:19:18 2015
@@ -80,6 +80,9 @@
 {
 	Q_OBJECT
 
+	friend class StoryEditor;
+	friend class SideBar;
+
 public:
 	SEditor (QWidget* parent, ScribusDoc *docc, StoryEditor* parentSE);
 	~SEditor() {};
@@ -100,6 +103,31 @@
 	void insertChars(const QString& styledText, const QString& editText);
 
 	StoryText StyledText;
+
+protected:
+
+	void insertCharsInternal(const QString& t);
+	void insertCharsInternal(const QString& t, int position);
+
+	void insertStyledText(const StoryText& styledText);
+	void insertStyledText(const StoryText& styledText, int position);
+
+	void insertUpdate(int position, int len);
+
+	void setAlign(QTextCursor& tCursor, int style);
+	void setEffects(QTextCursor& tCursor, int effects);
+
+	int  blockContentsChangeHook;
+	void keyPressEvent(QKeyEvent *k);
+	void inputMethodEvent(QInputMethodEvent *event);
+	void focusOutEvent(QFocusEvent *e);
+	void focusInEvent(QFocusEvent *e);
+	void scrollContentsBy(int dx, int dy);
+	virtual bool canInsertFromMimeData( const QMimeData * source ) const;
+	virtual QMimeData * createMimeDataFromSelection () const;
+	virtual void insertFromMimeData ( const QMimeData * source );
+	StoryEditor* parentStoryEditor;
+
 	QList<PageItem*> FrameItems;
 	ScribusDoc* doc;
 	bool unicodeTextEditMode;
@@ -135,30 +163,6 @@
 	int SelCharEnd;
 	int SuspendContentsChange;	// input method
 
-protected:
-
-	void insertCharsInternal(const QString& t);
-	void insertCharsInternal(const QString& t, int position);
-
-	void insertStyledText(const StoryText& styledText);
-	void insertStyledText(const StoryText& styledText, int position);
-
-	void insertUpdate(int position, int len);
-
-	void setAlign(QTextCursor& tCursor, int style);
-	void setEffects(QTextCursor& tCursor, int effects);
-
-	int  blockContentsChangeHook;
-	void keyPressEvent(QKeyEvent *k);
-	void inputMethodEvent(QInputMethodEvent *event);
-	void focusOutEvent(QFocusEvent *e);
-	void focusInEvent(QFocusEvent *e);
-	void scrollContentsBy(int dx, int dy);
-	virtual bool canInsertFromMimeData( const QMimeData * source ) const;
-	virtual QMimeData * createMimeDataFromSelection () const;
-	virtual void insertFromMimeData ( const QMimeData * source );
-	StoryEditor* parentStoryEditor;
-
 protected slots:
 	void handleContentsChange(int position, int charsRemoved, int charsAdded);