r19015 by craig - Final clean of ScribusWin

[scribus-commit]

Author: craig
Date: Sun Apr  6 14:56:34 2014
New Revision: 19015

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19015
Log:
Final clean of ScribusWin

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribuswin.cpp
    trunk/Scribus/scribus/scribuswin.h

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19015&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Apr  6 14:56:34 2014
@@ -4250,7 +4250,7 @@
 		view->zoom();
 		view->GotoPage(0);
 		connect(mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow *)), this, SLOT(newActWin(QMdiSubWindow *)));
-		connect(w, SIGNAL(AutoSaved()), this, SLOT(slotAutoSaved()));
+		connect(w, SIGNAL(autoSaved()), this, SLOT(slotAutoSaved()));
 		connect(ScCore->fileWatcher, SIGNAL(fileChanged(QString )), doc, SLOT(updatePict(QString)));
 		connect(ScCore->fileWatcher, SIGNAL(fileDeleted(QString )), doc, SLOT(removePict(QString)));
 		connect(ScCore->fileWatcher, SIGNAL(dirChanged(QString )), doc, SLOT(updatePictDir(QString )));
@@ -4697,7 +4697,7 @@
 	doc->autoSaveTimer->stop();
 	doc->disconnectDocSignals();
 	disconnect(doc, SIGNAL(saved(QString)));
-	disconnect(doc->WinHan, SIGNAL(AutoSaved()));
+	disconnect(doc->WinHan, SIGNAL(autoSaved()));
 	disconnect(ScCore->fileWatcher, SIGNAL(fileChanged(QString )), doc, SLOT(updatePict(QString)));
 	disconnect(ScCore->fileWatcher, SIGNAL(fileDeleted(QString )), doc, SLOT(removePict(QString)));
 	disconnect(ScCore->fileWatcher, SIGNAL(dirChanged(QString )), doc, SLOT(updatePictDir(QString )));

Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19015&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp (original)
+++ trunk/Scribus/scribus/scribuswin.cpp Sun Apr  6 14:56:34 2014
@@ -22,22 +22,14 @@
  ***************************************************************************/
 
 #include "scribuswin.h"
+
+#include <QApplication>
+#include <QMessageBox>
+
 #include "scribus.h"
 #include "commonstrings.h"
-#include "fileloader.h"
-#include "ui/pagepalette.h"
-#include "ui/pageselector.h"
-#include "ui/scrspinbox.h"
 #include "ui/storyeditor.h"
-#include "util.h"
-#include "util_file.h"
 #include "util_icon.h"
-
-#include <QApplication>
-#include <QCloseEvent>
-#include <QDir>
-#include <QFileInfo>
-#include <QMessageBox>
 
 ScribusWin::ScribusWin(QWidget* parent, ScribusDoc* doc) : QMainWindow(parent)
 {
@@ -55,7 +47,7 @@
 {
 	m_View = newView;
 	++m_Doc->viewCount;
-	winIndex = ++m_Doc->viewID;
+	m_winIndex = ++m_Doc->viewID;
 	setCentralWidget(newView);
 	setStatusBar(0);
 }
@@ -64,7 +56,7 @@
 {
 	setWindowTitle(QDir::toNativeSeparators(newName));
 	qApp->processEvents();
-	emit AutoSaved(); //TODO: to update the main window title, do this from the doc?
+	emit autoSaved(); //TODO: to update the main window title, do this from the doc?
 }
 
 void ScribusWin::closeEvent(QCloseEvent *ce)

Modified: trunk/Scribus/scribus/scribuswin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19015&path=/trunk/Scribus/scribus/scribuswin.h
==============================================================================
--- trunk/Scribus/scribus/scribuswin.h (original)
+++ trunk/Scribus/scribus/scribuswin.h Sun Apr  6 14:56:34 2014
@@ -24,8 +24,8 @@
 #ifndef SCRIBUSWIN_H
 #define SCRIBUSWIN_H
 
+#include <QCloseEvent>
 #include <QMainWindow>
-#include <QCloseEvent>
 #include <QMdiSubWindow>
 
 class ScribusDoc;
@@ -33,7 +33,6 @@
 class ScribusView;
 
 #include "scribusapi.h"
-class MasterPagesPalette;
 /**
   *@author Franz Schmid
   */
@@ -50,21 +49,22 @@
 	void setMainWindow(ScribusMainWindow *);
 	ScribusView* view() const { return m_View;}
 	ScribusDoc* doc() const { return m_Doc;}
-	QMdiSubWindow* getSubWin() { return subWindow; }
-	void setSubWin(QMdiSubWindow *win) { subWindow = win; }
+	QMdiSubWindow* getSubWin() { return m_subWindow; }
+	void setSubWin(QMdiSubWindow *win) { m_subWindow = win; }
 	
 public slots:
 	void slotSaved(QString newName);
 
 signals:
-	void AutoSaved();
+	void autoSaved();
 
 protected:
-	ScribusMainWindow* m_MainWindow;
-	ScribusView* m_View;
-	ScribusDoc* m_Doc;
-	QMdiSubWindow* subWindow;
-	int winIndex;
+	QMdiSubWindow *m_subWindow;
+	ScribusDoc *m_Doc;
+	ScribusMainWindow *m_MainWindow;
+	ScribusView *m_View;
+	int m_winIndex;
+
 };
 
 #endif