Author: craig
Date: Sat Apr 25 20:20:52 2020
New Revision: 23651
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23651
Log:
Code cleanup
Modified:
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribus.h
trunk/Scribus/scribus/ui/fontcombo.cpp
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23651&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Apr 25 20:20:52 2020
@@ -298,20 +298,11 @@
ScribusMainWindow::ScribusMainWindow() :
m_prefsManager(PrefsManager::instance())
{
- actionManager=nullptr;
- appModeHelper=nullptr;
- scrMenuMgr=nullptr;
- m_formatsManager=nullptr;
- resourceManager=nullptr;
- m_mainWindowStatusLabel=nullptr;
- m_ScriptRunning = 0;
#ifdef Q_OS_MAC
//commenting this out until this is resolved
:https://bugreports.qt.io/browse/QTBUG-44565
//ScQApp->setAttribute(Qt::AA_DontShowIconsInMenus);
//noIcon = IconManager::instance().loadPixmap("noicon.png");
#endif
- m_doc = nullptr;
- m_tocGenerator = nullptr;
}
/*
Modified: trunk/Scribus/scribus/scribus.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23651&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Sat Apr 25 20:20:52 2020
@@ -201,65 +201,65 @@
bool internalCopy;
QString internalCopyBuffer;
int HaveDoc;
- PrefsContext* dirs;
+ PrefsContext* dirs {nullptr};
/** \brief view is the main widget which represents your working area.
The View
* class should handle all events of the view widget. It is kept empty
so
* you can create your view according to your application's needs by
* changing the view class.
*/
- ScribusView *view;
+ ScribusView *view {nullptr};
/** \brief doc represents your actual document and is created only
once. It keeps
* information such as filename and does the serialization of your
files.
*/
- ScribusDoc *doc;
+ ScribusDoc *doc {nullptr};
/** \brief private doc for managing default patterns. */
- ScribusDoc* m_doc;
-
-
- QProgressBar* mainWindowProgressBar;
+ ScribusDoc* m_doc {nullptr};
+
+
+ QProgressBar* mainWindowProgressBar {nullptr};
ScrSpinBox* zoomSpinBox; //zoom spinbox at bottom of view
PageSelector* pageSelector; //Page selector at bottom of view
- QPushButton *zoomDefaultToolbarButton;
- QPushButton *zoomOutToolbarButton;
- QPushButton *zoomInToolbarButton;
- QComboBox *layerMenu; //Menu for layers at bottom of view
- QComboBox *unitSwitcher; //Menu for units at bottom of view
- EditToolBar *editToolBar;
- FileToolBar *fileToolBar;
- ModeToolBar* modeToolBar;
- PDFToolBar* pdfToolBar;
- ViewToolBar* viewToolBar;
- QLabel* mainWindowXPosLabel;
- QLabel* mainWindowXPosDataLabel;
- QLabel* mainWindowYPosLabel;
- QLabel* mainWindowYPosDataLabel;
- GuideManager *guidePalette;
- CharSelect *charPalette;
- PropertiesPalette *propertiesPalette;
- ContentPalette *contentPalette;
- MarksManager *marksManager;
- NotesStylesEditor *nsEditor;
- NodePalette *nodePalette;
- OutlinePalette *outlinePalette;
- Biblio *scrapbookPalette;
- LayerPalette* layerPalette;
- PagePalette *pagePalette;
- BookPalette *bookmarkPalette;
- DownloadsPalette *downloadsPalette;
- SymbolPalette *symbolPalette;
- InlinePalette *inlinePalette;
- Measurements* measurementPalette;
- CheckDocument * docCheckerPalette;
- UndoPalette* undoPalette;
- AlignDistributePalette *alignDistributePalette;
- ResourceManager *resourceManager;
- StoryEditor* storyEditor;
- StoryEditor* CurrStED;
- QMdiArea *mdiArea;
- ScribusWin* ActWin;
- QClipboard *ClipB;
+ QPushButton *zoomDefaultToolbarButton {nullptr};
+ QPushButton *zoomOutToolbarButton {nullptr};
+ QPushButton *zoomInToolbarButton {nullptr};
+ QComboBox *layerMenu {nullptr}; //Menu for layers at bottom of view
+ QComboBox *unitSwitcher {nullptr}; //Menu for units at bottom of view
+ EditToolBar *editToolBar {nullptr};
+ FileToolBar *fileToolBar {nullptr};
+ ModeToolBar* modeToolBar {nullptr};
+ PDFToolBar* pdfToolBar {nullptr};
+ ViewToolBar* viewToolBar {nullptr};
+ QLabel* mainWindowXPosLabel {nullptr};
+ QLabel* mainWindowXPosDataLabel {nullptr};
+ QLabel* mainWindowYPosLabel {nullptr};
+ QLabel* mainWindowYPosDataLabel {nullptr};
+ GuideManager *guidePalette {nullptr};
+ CharSelect *charPalette {nullptr};
+ PropertiesPalette *propertiesPalette {nullptr};
+ ContentPalette *contentPalette {nullptr};
+ MarksManager *marksManager {nullptr};
+ NotesStylesEditor *nsEditor {nullptr};
+ NodePalette *nodePalette {nullptr};
+ OutlinePalette *outlinePalette {nullptr};
+ Biblio *scrapbookPalette {nullptr};
+ LayerPalette* layerPalette {nullptr};
+ PagePalette *pagePalette {nullptr};
+ BookPalette *bookmarkPalette {nullptr};
+ DownloadsPalette *downloadsPalette {nullptr};
+ SymbolPalette *symbolPalette {nullptr};
+ InlinePalette *inlinePalette {nullptr};
+ Measurements* measurementPalette {nullptr};
+ CheckDocument * docCheckerPalette {nullptr};
+ UndoPalette* undoPalette {nullptr};
+ AlignDistributePalette *alignDistributePalette {nullptr};
+ ResourceManager *resourceManager {nullptr};
+ StoryEditor* storyEditor {nullptr};
+ StoryEditor* CurrStED {nullptr};
+ QMdiArea *mdiArea {nullptr};
+ ScribusWin* ActWin {nullptr};
+ QClipboard *ClipB {nullptr};
QString LoadEnc;
- AppModeHelper *appModeHelper;
+ AppModeHelper *appModeHelper {nullptr};
QMap<QString, QPointer<ScrAction> > scrActions;
QMap<QString, QPointer<ScrAction> > scrRecentFileActions;
@@ -269,8 +269,8 @@
QMap<QString, QPointer<ScrAction> > scrRecentPasteActions;
QMap<QString, QPointer<ScToolBar> > scrToolBars;
QMultiHash<QString, QActionGroup*> scrActionGroups;
- ScMWMenuManager* scrMenuMgr;
- ActionManager* actionManager;
+ ScMWMenuManager* scrMenuMgr {nullptr};
+ ActionManager* actionManager {nullptr};
QStringList m_recentDocsList;
QStringList patternsDependingOnThis;
@@ -612,9 +612,9 @@
void initScrapbook();
void updateColorMenu(QProgressBar* progressBar=nullptr);
- int m_ScriptRunning;
-
- QLabel* m_mainWindowStatusLabel;
+ int m_ScriptRunning {0};
+
+ QLabel* m_mainWindowStatusLabel {nullptr};
QString m_statusLabelText;
//QPixmap noIcon;
@@ -650,15 +650,15 @@
QString Dname;
QString Command;
} PDef ;
- TOCGenerator *m_tocGenerator;
+ TOCGenerator *m_tocGenerator {nullptr};
int m_storedPageNum;
int m_storedViewXCoor;
int m_storedViewYCoor;
double m_storedViewScale;
- StyleManager *m_styleManager;
- UndoManager *m_undoManager;
+ StyleManager *m_styleManager {nullptr};
+ UndoManager *m_undoManager {nullptr};
PrefsManager& m_prefsManager;
- FormatsManager *m_formatsManager;
+ FormatsManager *m_formatsManager {nullptr};
QPointer<HelpBrowser> m_helpBrowser;
QString m_osgFilterString;
@@ -668,8 +668,6 @@
int m_marksCount; //remember marks count from last call
bool m_WasAutoSave;
bool m_pagePalVisible;
-
- //QQuickView *m_qqview;
};
#endif
Modified: trunk/Scribus/scribus/ui/fontcombo.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23651&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp (original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp Sat Apr 25 20:20:52 2020
@@ -522,8 +522,8 @@
QPainter invpixPainter(&invPixmap);
QRect r(0, 0, option.rect.width(), option.rect.height());
- pixPainter.fillRect(r, option.palette.background());
- invpixPainter.fillRect(r, option.palette.background());
+ pixPainter.fillRect(r, option.palette.window());
+ invpixPainter.fillRect(r, option.palette.window());
QFont font = option.font;
font.setPointSize(QFontInfo(font).pointSize() * 3 / 2.0);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
