r24048 by jghali - Code cleanup
scribus-commit
scribus-commit at lists.scribus.net
Thu Oct 1 14:48:19 UTC 2020
Author: jghali
Date: Thu Oct 1 14:48:19 2020
New Revision: 24048
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24048
Log:
Code cleanup
Modified:
trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h
trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h
trunk/Scribus/scribus/plugins/shapes/shapepalette.h
trunk/Scribus/scribus/scribus.h
trunk/Scribus/scribus/scribusview.h
trunk/Scribus/scribus/scribuswin.h
trunk/Scribus/scribus/ui/aligndistribute.h
trunk/Scribus/scribus/ui/applytemplatedialog.h
trunk/Scribus/scribus/ui/arcvectordialog.h
trunk/Scribus/scribus/ui/autoformbuttongroup.h
trunk/Scribus/scribus/ui/bookmarkpalette.h
trunk/Scribus/scribus/ui/charselect.h
trunk/Scribus/scribus/ui/charselectenhanced.h
trunk/Scribus/scribus/ui/checkDocument.h
trunk/Scribus/scribus/ui/colorlistbox.h
trunk/Scribus/scribus/ui/contentpalette_default.h
trunk/Scribus/scribus/ui/contentpalette_page.h
trunk/Scribus/scribus/ui/curvewidget.h
trunk/Scribus/scribus/ui/dasheditor.h
trunk/Scribus/scribus/ui/fontcombo.h
trunk/Scribus/scribus/ui/fontreplacedialog.h
trunk/Scribus/scribus/ui/gradienteditor.h
trunk/Scribus/scribus/ui/gradientvectordialog.h
trunk/Scribus/scribus/ui/guidemanager.h
trunk/Scribus/scribus/ui/inlinepalette.h
trunk/Scribus/scribus/ui/latexeditor.h
trunk/Scribus/scribus/ui/layers.h
trunk/Scribus/scribus/ui/loremipsum.h
trunk/Scribus/scribus/ui/marksmanager.h
trunk/Scribus/scribus/ui/measurements.h
trunk/Scribus/scribus/ui/nodeeditpalette.h
trunk/Scribus/scribus/ui/notesstyleseditor.h
trunk/Scribus/scribus/ui/outlinepalette.h
trunk/Scribus/scribus/ui/pagepalette.h
trunk/Scribus/scribus/ui/pagepalette_pages.h
trunk/Scribus/scribus/ui/patternpropsdialog.h
trunk/Scribus/scribus/ui/preferencesdialog.h
trunk/Scribus/scribus/ui/prefs_printer.cpp
trunk/Scribus/scribus/ui/propertiespalette.h
trunk/Scribus/scribus/ui/propertiespalette_group.h
trunk/Scribus/scribus/ui/propertiespalette_image.h
trunk/Scribus/scribus/ui/propertiespalette_line.h
trunk/Scribus/scribus/ui/propertiespalette_shadow.h
trunk/Scribus/scribus/ui/propertiespalette_shape.h
trunk/Scribus/scribus/ui/propertiespalette_text.h
trunk/Scribus/scribus/ui/propertiespalette_xyz.h
trunk/Scribus/scribus/ui/propertywidget_advanced.h
trunk/Scribus/scribus/ui/propertywidget_distance.h
trunk/Scribus/scribus/ui/propertywidget_flop.h
trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h
trunk/Scribus/scribus/ui/propertywidget_hyphenation.h
trunk/Scribus/scribus/ui/propertywidget_optmargins.h
trunk/Scribus/scribus/ui/propertywidget_orphans.h
trunk/Scribus/scribus/ui/propertywidget_pareffect.h
trunk/Scribus/scribus/ui/propertywidget_pathtext.h
trunk/Scribus/scribus/ui/propertywidget_textcolor.h
trunk/Scribus/scribus/ui/resourcemanager.h
trunk/Scribus/scribus/ui/scdockpalette.h
trunk/Scribus/scribus/ui/scinputdialog.h
trunk/Scribus/scribus/ui/scrpalettebase.cpp
trunk/Scribus/scribus/ui/scrpalettebase.h
trunk/Scribus/scribus/ui/shortcutwidget.h
trunk/Scribus/scribus/ui/smcellstylewidget.h
trunk/Scribus/scribus/ui/smcstylewidget.h
trunk/Scribus/scribus/ui/smfontfeatures.h
trunk/Scribus/scribus/ui/smlinestyle.h
trunk/Scribus/scribus/ui/smlinestylewidget.h
trunk/Scribus/scribus/ui/smpstylewidget.h
trunk/Scribus/scribus/ui/smtablestylewidget.h
trunk/Scribus/scribus/ui/spiralvectordialog.h
trunk/Scribus/scribus/ui/storyeditor.h
trunk/Scribus/scribus/ui/stylemanager.h
trunk/Scribus/scribus/ui/styleselect.h
trunk/Scribus/scribus/ui/symbolpalette.h
trunk/Scribus/scribus/ui/tabruler.h
trunk/Scribus/scribus/ui/textpalette.cpp
trunk/Scribus/scribus/ui/textpalette.h
trunk/Scribus/scribus/ui/unicodesearch.h
trunk/Scribus/scribus/ui/weldedit.h
trunk/Scribus/scribus/undogui.h
Modified: trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/pconsole.h Thu Oct 1 14:48:19 2020
@@ -41,10 +41,6 @@
//! \brief File name for saving the contents
QString filename;
- //! \brief Close event for turning the action off
- void closeEvent(QCloseEvent *);
-
- virtual void changeEvent(QEvent *e);
void updateSyntaxHighlighter();
public slots:
@@ -76,6 +72,11 @@
QLabel * changedLabel;
QLabel * cursorLabel;
QString cursorTemplate;
+
+ //! \brief Process change event
+ void changeEvent(QEvent *e) override;
+ //! \brief Close event for turning the action off
+ void closeEvent(QCloseEvent *) override;
protected slots:
virtual void languageChange();
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h Thu Oct 1 14:48:19 2020
@@ -41,10 +41,6 @@
//! \brief File name for saving the contents
QString filename;
- //! \brief Close event for turning the action off
- void closeEvent(QCloseEvent *);
-
- virtual void changeEvent(QEvent *e);
void updateSyntaxHighlighter();
public slots:
@@ -76,6 +72,11 @@
QLabel * changedLabel;
QLabel * cursorLabel;
QString cursorTemplate;
+
+ //! \brief Process change event
+ void changeEvent(QEvent *e) override;
+ //! \brief Close event for turning the action off
+ void closeEvent(QCloseEvent *) override;
protected slots:
void languageChange();
Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.h
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.h (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.h Thu Oct 1 14:48:19 2020
@@ -100,8 +100,6 @@
void setMainWindow(ScribusMainWindow *mw);
void setDoc(ScribusDoc *);
void unsetDoc();
-
- virtual void changeEvent(QEvent *e);
public slots:
void closeTab();
@@ -120,6 +118,8 @@
ScribusDoc *m_doc {nullptr};
ScribusMainWindow *m_scMW {nullptr};
+
+ void changeEvent(QEvent *e) override;
};
#endif
Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Thu Oct 1 14:48:19 2020
@@ -152,12 +152,14 @@
ScribusDoc *doFileNew(double width, double height, double topMargin, double leftMargin, double rightMargin, double bottomMargin, double columnDistance, double columnCount, bool autoTextFrames, int pageArrangement, int unitIndex, int firstPageLocation, int orientation, int firstPageNumber, const QString& defaultPageSize, bool requiresGUI, int pageCount=1, bool showView=true, int marginPreset=0);
ScribusDoc *newDoc(double width, double height, double topMargin, double leftMargin, double rightMargin, double bottomMargin, double columnDistance, double columnCount, bool autoTextFrames, int pageArrangement, int unitIndex, int firstPageLocation, int orientation, int firstPageNumber, const QString& defaultPageSize, bool requiresGUI, int pageCount=1, bool showView=true, int marginPreset=0);
bool DoFileSave(const QString& fileName, QString* savedFileName = nullptr);
- void changeEvent(QEvent *e);
- void closeEvent(QCloseEvent *ce);
- void keyPressEvent(QKeyEvent *k);
- void keyReleaseEvent(QKeyEvent *k);
- void inputMethodEvent (QInputMethodEvent *event);
- QVariant inputMethodQuery ( Qt::InputMethodQuery query ) const ;
+
+ void changeEvent(QEvent *e) override;
+ void closeEvent(QCloseEvent *ce) override;
+ void keyPressEvent(QKeyEvent *k) override;
+ void keyReleaseEvent(QKeyEvent *k) override;
+ void inputMethodEvent (QInputMethodEvent *event) override;
+ QVariant inputMethodQuery ( Qt::InputMethodQuery query ) const override;
+
void requestUpdate(int);
void setTBvals(PageItem *currItem);
int ShowSubs();
@@ -595,9 +597,9 @@
/*!
\brief Receive key events from palettes such as palette hiding events. Possibly easier way but this is cleaner than before. No need to modify all those palettes and each new one in future.
*/
- bool eventFilter( QObject *o, QEvent *e );
- virtual void dragEnterEvent( QDragEnterEvent* e);
- virtual void dropEvent( QDropEvent* e);
+ bool eventFilter( QObject *o, QEvent *e ) override;
+ void dragEnterEvent( QDragEnterEvent* e) override;
+ void dropEvent( QDropEvent* e) override;
private:
/** init methods */
Modified: trunk/Scribus/scribus/scribusview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h (original)
+++ trunk/Scribus/scribus/scribusview.h Thu Oct 1 14:48:19 2020
@@ -313,13 +313,13 @@
void dragTimerTimeOut();
public:
- virtual void wheelEvent(QWheelEvent *ev);
- virtual void changeEvent(QEvent *e);
+ void wheelEvent(QWheelEvent *ev) override;
+ void changeEvent(QEvent *e) override;
void nativeGestureEvent(QNativeGestureEvent *e);
- void keyPressEvent(QKeyEvent *k);
- void keyReleaseEvent(QKeyEvent *k);
- void inputMethodEvent(QInputMethodEvent * event);
- QVariant inputMethodQuery(Qt::InputMethodQuery query) const ;
+ void keyPressEvent(QKeyEvent *k) override;
+ void keyReleaseEvent(QKeyEvent *k) override;
+ void inputMethodEvent(QInputMethodEvent * event) override;
+ QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
inline void registerMousePress(QPoint p);
bool mousePressed();
Modified: trunk/Scribus/scribus/scribuswin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/scribuswin.h
==============================================================================
--- trunk/Scribus/scribus/scribuswin.h (original)
+++ trunk/Scribus/scribus/scribuswin.h Thu Oct 1 14:48:19 2020
@@ -45,7 +45,6 @@
ScribusWin(QWidget* parent, ScribusDoc* doc);
~ScribusWin() {};
- void closeEvent(QCloseEvent *ce);
void setView(ScribusView* newView);
void setMainWindow(ScribusMainWindow *);
ScribusView* view() const { return m_View;}
@@ -60,6 +59,7 @@
ScribusView *m_View {nullptr};
int m_winIndex {0};
+ void closeEvent(QCloseEvent *ce) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/aligndistribute.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/aligndistribute.h
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.h (original)
+++ trunk/Scribus/scribus/ui/aligndistribute.h Thu Oct 1 14:48:19 2020
@@ -61,8 +61,6 @@
virtual void setDoc( ScribusDoc* newDoc );
void unitChange();
-
- virtual void changeEvent(QEvent *e);
public slots:
void setGuide(int, qreal);
@@ -70,6 +68,8 @@
protected:
ScribusView *currView;
+
+ void changeEvent(QEvent *e) override;
protected slots:
virtual void iconSetChange();
Modified: trunk/Scribus/scribus/ui/applytemplatedialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/applytemplatedialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/applytemplatedialog.h (original)
+++ trunk/Scribus/scribus/ui/applytemplatedialog.h Thu Oct 1 14:48:19 2020
@@ -41,8 +41,6 @@
public:
ApplyMasterPageDialog( QWidget* parent = nullptr );
~ApplyMasterPageDialog();
-
- virtual void changeEvent(QEvent *e);
QLabel* masterPageLabel;
QComboBox* masterPageComboBox;
@@ -74,6 +72,8 @@
QSpacerItem* spacer3;
QHBoxLayout* layout8;
QSpacerItem* spacer1;
+
+ void changeEvent(QEvent *e) override;
protected slots:
virtual void languageChange();
Modified: trunk/Scribus/scribus/ui/arcvectordialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/arcvectordialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/arcvectordialog.h (original)
+++ trunk/Scribus/scribus/ui/arcvectordialog.h Thu Oct 1 14:48:19 2020
@@ -44,7 +44,6 @@
public:
ArcVectorDialog( QWidget* parent);
~ArcVectorDialog() {};
- virtual void changeEvent(QEvent *e);
public slots:
void languageChange();
@@ -52,6 +51,9 @@
void setValues(double start, double sweep, double height, double width);
void unitChange(int unitIndex);
+protected:
+ void changeEvent(QEvent *e) override;
+
signals:
void NewVectors(double, double, double, double);
void endEdit();
Modified: trunk/Scribus/scribus/ui/autoformbuttongroup.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/autoformbuttongroup.h
==============================================================================
--- trunk/Scribus/scribus/ui/autoformbuttongroup.h (original)
+++ trunk/Scribus/scribus/ui/autoformbuttongroup.h Thu Oct 1 14:48:19 2020
@@ -26,71 +26,15 @@
public:
AutoformButtonGroup( QWidget* parent );
~AutoformButtonGroup() {};
+
void addShape(QMenu* menu, int shapenum);
qreal* getShapeData(int a, int *n);
QPixmap getIconPixmap(int nr, int pixmapSize=22);
- virtual void changeEvent(QEvent *e);
-/* QButtonGroup* buttonGroup;
- QToolButton* toolButton1;
- QToolButton* toolButton2;
- QToolButton* toolButton3;
- QToolButton* toolButton4;
- QToolButton* toolButton5;
- QToolButton* toolButton6;
- QToolButton* toolButton7;
- QToolButton* toolButton8;
- QToolButton* toolButton9;
- QToolButton* toolButton10;
- QToolButton* toolButton11;
- QToolButton* toolButton12;
- QToolButton* toolButton13;
- QToolButton* toolButton14;
- QToolButton* toolButton15;
- QToolButton* toolButton16;
- QToolButton* toolButton17;
- QToolButton* toolButton18;
- QToolButton* toolButton19;
- QToolButton* toolButton20;
- QCheckBox* checkDoubleArrows;
- QToolButton* toolButton21;
- QToolButton* toolButton22;
- QToolButton* toolButton23;
- QCheckBox* checkFlowChart;
- QToolButton* toolButton25;
- QToolButton* toolButton26;
- QToolButton* toolButton27;
- QToolButton* toolButton28;
- QToolButton* toolButton29;
- QToolButton* toolButton30;
- QToolButton* toolButton31;
- QToolButton* toolButton32;
- QCheckBox* checkJigSaw;
- QToolButton* toolButton33;
- QToolButton* toolButton34;
- QToolButton* toolButton35;
- QToolButton* toolButton36;
- QToolButton* toolButton37;
- QToolButton* toolButton38;
- QToolButton* toolButton39;
- QToolButton* toolButton40;
- QToolButton* toolButton41;
- QToolButton* toolButton42;
- QToolButton* toolButton43;
- QToolButton* toolButton44;
- QCheckBox* checkSpecials;
- QToolButton* toolButton24;
- QToolButton* toolButton45;
-*/
+
public slots:
void selForm(int a);
void languageChange();
-/*
-private slots:
- void toggleDoubleArrows(bool visible);
- void toggleSpecials(bool visible);
- void toggleFlowChart(bool visible);
- void toggleJigSaw(bool visible);
-*/
+
signals:
void FormSel(int, int, qreal *);
void buttonClicked(int);
@@ -102,8 +46,8 @@
QMenu *menu3;
QMenu *menu4;
QMenu *menu5;
-/* QGridLayout* buttonGroup1Layout;
-*/
+
+ void changeEvent(QEvent *e) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/bookmarkpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/bookmarkpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/bookmarkpalette.h (original)
+++ trunk/Scribus/scribus/ui/bookmarkpalette.h Thu Oct 1 14:48:19 2020
@@ -52,12 +52,13 @@
BookPalette(QWidget* parent);
~BookPalette() {};
- virtual void changeEvent(QEvent *e);
-
BookmarkView *BView;
public slots:
void languageChange();
+
+protected:
+ void changeEvent(QEvent *e) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/charselect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/charselect.h
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.h (original)
+++ trunk/Scribus/scribus/ui/charselect.h Thu Oct 1 14:48:19 2020
@@ -48,7 +48,8 @@
//! Used for StoryEditor
CharTableModel * userTableModel() { return m_userTableModel; }
- virtual void changeEvent(QEvent *e);
+protected:
+ void changeEvent(QEvent *e) override;
signals:
/*! \brief A signall emittedthis palette tries to insert glyphs.
Modified: trunk/Scribus/scribus/ui/charselectenhanced.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/charselectenhanced.h
==============================================================================
--- trunk/Scribus/scribus/ui/charselectenhanced.h (original)
+++ trunk/Scribus/scribus/ui/charselectenhanced.h Thu Oct 1 14:48:19 2020
@@ -41,6 +41,9 @@
void newCharClass(int c);
void delEdit();
void insChar();
+
+protected:
+ void changeEvent(QEvent *e) override;
private:
ScribusDoc* m_doc;
@@ -89,8 +92,6 @@
void setupRangeCombo();
void generatePreview(int charClass);
- virtual void changeEvent(QEvent *e);
-
private slots:
void hexLineEdit_returnPressed();
};
Modified: trunk/Scribus/scribus/ui/checkDocument.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/checkDocument.h
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.h (original)
+++ trunk/Scribus/scribus/ui/checkDocument.h Thu Oct 1 14:48:19 2020
@@ -42,7 +42,6 @@
CheckDocument( QWidget* parent, bool modal );
~CheckDocument() {};
- virtual void changeEvent(QEvent *e);
void setDoc(ScribusDoc *doc);
/*! \brief State of the P.V. */
@@ -105,16 +104,14 @@
//! \brief Signal emitted when user press the "ignore errors" button.
void ignoreAllErrors();
-
-
protected slots:
void iconSetChange();
void languageChange();
protected:
- QVBoxLayout* checkDocumentLayout;
- QHBoxLayout* layout1;
- QHBoxLayout* layout2;
+ QVBoxLayout* checkDocumentLayout { nullptr };
+ QHBoxLayout* layout1 { nullptr };
+ QHBoxLayout* layout2 { nullptr };
//! \brief Mappping Page Item - item nr.
QMap<QTreeWidgetItem*, QPointer<PageItem> > itemMap;
//! \brief Mappping Page - page nr.
@@ -163,17 +160,17 @@
//! \brief Flag if is ignore button shown. true = hidden, false = shown.
bool noButton;
- QComboBox* curCheckProfile;
- QLabel* textLabel1;
- QTreeWidget* reportDisplay;
- QPushButton* ignoreErrors;
- QPushButton* reScan;
+ QComboBox* curCheckProfile { nullptr };
+ QLabel* textLabel1 { nullptr };
+ QTreeWidget* reportDisplay { nullptr };
+ QPushButton* ignoreErrors { nullptr };
+ QPushButton* reScan { nullptr };
// bool globalGraveError;
- bool pageGraveError {false};
- bool itemError {false};
- bool showPagesWithoutErrors;
- bool showNonPrintingLayerErrors;
+ bool pageGraveError { false };
+ bool itemError { false };
+ bool showPagesWithoutErrors { false };
+ bool showNonPrintingLayerErrors { true };
int minResDPI {0};
int maxResDPI {0};
@@ -192,6 +189,8 @@
void buildItem(QTreeWidgetItem * item,
PreflightError errorType,
PageItem * pageItem);
+
+ void changeEvent(QEvent *e) override;
};
#endif // CHECKDOCUMENT_H
Modified: trunk/Scribus/scribus/ui/colorlistbox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/colorlistbox.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.h (original)
+++ trunk/Scribus/scribus/ui/colorlistbox.h Thu Oct 1 14:48:19 2020
@@ -49,8 +49,6 @@
ColorListBox(QWidget* parent = nullptr);
ColorListBox(ColorListBox::PixmapType type, QWidget* parent = nullptr);
~ColorListBox();
-
- virtual void changeEvent(QEvent *e);
/*! Return the current color name */
QString currentColor() const;
@@ -138,7 +136,9 @@
void itemSelectionChanged();
protected:
- bool viewportEvent(QEvent *event);
+ void changeEvent(QEvent *e) override;
+ bool viewportEvent(QEvent *event) override;
+
static int initialized;
static int sortRule;
ColorListBox::PixmapType m_type;
Modified: trunk/Scribus/scribus/ui/contentpalette_default.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/contentpalette_default.h
==============================================================================
--- trunk/Scribus/scribus/ui/contentpalette_default.h (original)
+++ trunk/Scribus/scribus/ui/contentpalette_default.h Thu Oct 1 14:48:19 2020
@@ -26,8 +26,6 @@
ContentPalette_Default(QWidget* parent);
~ContentPalette_Default() {};
- virtual void changeEvent(QEvent *e);
-
// void showTextFlowMode(PageItem::TextFlowMode mode);
// void updateColorList();
@@ -43,6 +41,7 @@
ScribusMainWindow* m_ScMW = nullptr;
ScGuardedPtr<ScribusDoc> m_doc;
+ void changeEvent(QEvent *e) override;
void setLabelText();
public slots:
Modified: trunk/Scribus/scribus/ui/contentpalette_page.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/contentpalette_page.h
==============================================================================
--- trunk/Scribus/scribus/ui/contentpalette_page.h (original)
+++ trunk/Scribus/scribus/ui/contentpalette_page.h Thu Oct 1 14:48:19 2020
@@ -26,8 +26,6 @@
ContentPalette_Page(QWidget* parent);
~ContentPalette_Page() {};
- virtual void changeEvent(QEvent *e);
-
protected:
bool m_haveDoc = false;
bool m_haveItem = false;
@@ -37,6 +35,8 @@
// PageItem *m_item;
ScribusMainWindow* m_ScMW = nullptr;
ScGuardedPtr<ScribusDoc> m_doc;
+
+ void changeEvent(QEvent *e) override;
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: trunk/Scribus/scribus/ui/curvewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/curvewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.h (original)
+++ trunk/Scribus/scribus/ui/curvewidget.h Thu Oct 1 14:48:19 2020
@@ -71,8 +71,6 @@
CurveWidget(QWidget* parent);
~CurveWidget() {};
- virtual void changeEvent(QEvent *e);
-
void setLinear(bool setter);
QPushButton* invertButton;
QPushButton* resetButton;
@@ -93,6 +91,8 @@
QVBoxLayout* layout1;
QSpacerItem* spacer1;
+ void changeEvent(QEvent *e) override;
+
protected slots:
virtual void languageChange();
};
Modified: trunk/Scribus/scribus/ui/dasheditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/dasheditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/dasheditor.h (original)
+++ trunk/Scribus/scribus/ui/dasheditor.h Thu Oct 1 14:48:19 2020
@@ -84,7 +84,6 @@
DashEditor(QWidget *pa);
~DashEditor() {};
- virtual void changeEvent(QEvent *e);
void setDashValues(QVector<double> vals, double linewidth, double offset);
QVector<double> getDashValues(double linewidth);
@@ -93,6 +92,9 @@
QDoubleSpinBox *Position;
QLabel *Desc2;
QDoubleSpinBox *Offset;
+
+protected:
+ void changeEvent(QEvent *e) override;
public slots:
void setPos(double);
Modified: trunk/Scribus/scribus/ui/fontcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/fontcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.h (original)
+++ trunk/Scribus/scribus/ui/fontcombo.h Thu Oct 1 14:48:19 2020
@@ -74,8 +74,6 @@
FontComboH(QWidget* parent, bool labels=false);
~FontComboH() {}
- virtual void changeEvent(QEvent *e);
-
QString currentFont();
void rebuildList(ScribusDoc *currentDoc, bool forAnnotation = false, bool forSubstitute = false);
@@ -105,6 +103,8 @@
QPixmap otfFont;
QPixmap psFont;
QPixmap substFont;
+
+ void changeEvent(QEvent *e) override;
};
// based on Qfontcombobox class from Qt project
Modified: trunk/Scribus/scribus/ui/fontreplacedialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/fontreplacedialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/fontreplacedialog.h (original)
+++ trunk/Scribus/scribus/ui/fontreplacedialog.h Thu Oct 1 14:48:19 2020
@@ -39,9 +39,9 @@
void leaveOK();
protected:
- void closeEvent(QCloseEvent *closeEvent);
- QVBoxLayout* FontReplaceDialogLayout;
- QHBoxLayout* layout1;
+ void closeEvent(QCloseEvent *closeEvent) override;
+ QVBoxLayout* FontReplaceDialogLayout { nullptr };
+ QHBoxLayout* layout1 { nullptr };
};
Modified: trunk/Scribus/scribus/ui/gradienteditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/gradienteditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/gradienteditor.h (original)
+++ trunk/Scribus/scribus/ui/gradienteditor.h Thu Oct 1 14:48:19 2020
@@ -45,12 +45,12 @@
public:
GradientEditor(QWidget *pa);
~GradientEditor() {};
+
void setGradient(const VGradient& grad);
const VGradient &gradient();
void setColors(ColorList &colorList);
QColor setColor(const QString& colorName, int shad);
void setGradientEditable(bool val);
- virtual void changeEvent(QEvent *e);
public slots:
void setPos(double);
@@ -68,7 +68,9 @@
protected:
ColorList m_colorList;
- virtual bool event ( QEvent * event );
+
+ void changeEvent(QEvent *e) override;
+ bool event(QEvent * event ) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/gradientvectordialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/gradientvectordialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/gradientvectordialog.h (original)
+++ trunk/Scribus/scribus/ui/gradientvectordialog.h Thu Oct 1 14:48:19 2020
@@ -44,7 +44,7 @@
public:
GradientVectorDialog( QWidget* parent);
~GradientVectorDialog() {};
- virtual void changeEvent(QEvent *e);
+
void selectLinear();
void selectRadial();
void selectConical();
@@ -73,6 +73,8 @@
protected:
double m_unitRatio;
+ void changeEvent(QEvent *e) override;
+
signals:
void NewSpecial(double, double, double, double, double, double, double, double, double, double);
void editGradient(int);
Modified: trunk/Scribus/scribus/ui/guidemanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/guidemanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.h (original)
+++ trunk/Scribus/scribus/ui/guidemanager.h Thu Oct 1 14:48:19 2020
@@ -70,8 +70,9 @@
int currentIndex() const { return tabWidget->currentIndex(); }
void setGuideLock(bool guidesLocked);
-
- virtual void changeEvent(QEvent *e);
+
+protected:
+ void changeEvent(QEvent *e) override;
private:
//! \brief Store the guide values in the Qt4 model
Modified: trunk/Scribus/scribus/ui/inlinepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/inlinepalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/inlinepalette.h (original)
+++ trunk/Scribus/scribus/ui/inlinepalette.h Thu Oct 1 14:48:19 2020
@@ -80,8 +80,6 @@
void editingStart(int itemID);
void editingFinished();
void updateItemList();
-
- virtual void changeEvent(QEvent *e);
public slots:
void handleContextMenue(QPoint p);
@@ -104,6 +102,8 @@
ScribusMainWindow *m_scMW;
int actItem;
int currentEditedItem;
+
+ void changeEvent(QEvent *e) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/latexeditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/latexeditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/latexeditor.h (original)
+++ trunk/Scribus/scribus/ui/latexeditor.h Thu Oct 1 14:48:19 2020
@@ -45,7 +45,7 @@
public:
LatexEditor(PageItem_LatexFrame *);
~LatexEditor();
- virtual void changeEvent(QEvent *e);
+
void startEditor();
void exitEditor();
void revert();
@@ -53,24 +53,30 @@
void initialize();
static QIcon icon(const QString& config, const QString& fn);
static QString iconFile(QString config);
+
protected:
- PageItem_LatexFrame *frame;
- LatexHighlighter *highlighter;
+ PageItem_LatexFrame *frame { nullptr };
+ LatexHighlighter *highlighter { nullptr };
+ QMap<QString, XmlWidget *> widgetMap;
+ QString currentConfigFile, currentIconFile;
+ QString extEditorFile;
+ QProcess *extEditor { nullptr };
+ FileWatcher *fileWatcher { nullptr };
+
+ void changeEvent(QEvent *e) override;
+
void loadSettings();
void createNewSettingsTab(I18nXmlStreamReader *xml);
void createNewItemsTab(I18nXmlStreamReader *xml);
- QMap<QString, XmlWidget *> widgetMap;
- QString currentConfigFile, currentIconFile;
- /*External Editor*/
- QString extEditorFile;
+
void loadExternalEditorFile();
void writeExternalEditorFile();
- QProcess *extEditor;
- FileWatcher *fileWatcher;
+
protected slots:
void extEditorFinished(int exitCode, QProcess::ExitStatus exitStatus);
void extEditorFileChanged(const QString& filename);
void extEditorError(QProcess::ProcessError error);
+
public slots:
void okClicked();
void cancelClicked();
Modified: trunk/Scribus/scribus/ui/layers.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/layers.h
==============================================================================
--- trunk/Scribus/scribus/ui/layers.h (original)
+++ trunk/Scribus/scribus/ui/layers.h Thu Oct 1 14:48:19 2020
@@ -35,13 +35,11 @@
public:
LayerPalette(QWidget* parent);
~LayerPalette() {};
-
- virtual void changeEvent(QEvent *e);
void setDoc(ScribusDoc* doc);
void rebuildList();
- QTableWidget* Table; //public for the event filter in scribus.cpp.. TODO
+ QTableWidget* Table { nullptr }; //public for the event filter in scribus.cpp.. TODO
public slots:
void addLayer();
@@ -71,22 +69,24 @@
void LayerActivated(int);
protected:
- QWidget* containerWidget;
- ScribusDoc* m_Doc;
- QVBoxLayout* LayerPaletteLayout;
- QHBoxLayout* Layout1;
- QHBoxLayout* layout1;
- QLabel* textLabel1;
- QComboBox* blendMode;
- QLabel* textLabel2;
- ScrSpinBox* opacitySpinBox;
- QHeaderView* Header;
- QPushButton* newLayerButton;
- QPushButton* duplicateLayerButton;
- QPushButton* deleteLayerButton;
- QPushButton* raiseLayerButton;
- QPushButton* lowerLayerButton;
- ScLayers *layers;
+ QWidget* containerWidget { nullptr };
+ ScribusDoc* m_Doc { nullptr };
+ QVBoxLayout* LayerPaletteLayout { nullptr };
+ QHBoxLayout* Layout1 { nullptr };
+ QHBoxLayout* layout1 { nullptr };
+ QLabel* textLabel1 { nullptr };
+ QComboBox* blendMode { nullptr };
+ QLabel* textLabel2 { nullptr };
+ ScrSpinBox* opacitySpinBox { nullptr };
+ QHeaderView* Header { nullptr };
+ QPushButton* newLayerButton { nullptr };
+ QPushButton* duplicateLayerButton { nullptr };
+ QPushButton* deleteLayerButton { nullptr };
+ QPushButton* raiseLayerButton { nullptr };
+ QPushButton* lowerLayerButton { nullptr };
+ ScLayers *layers { nullptr };
+
+ void changeEvent(QEvent *e) override;
};
#endif // LAYERPALETTE_H
Modified: trunk/Scribus/scribus/ui/loremipsum.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/loremipsum.h
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.h (original)
+++ trunk/Scribus/scribus/ui/loremipsum.h Thu Oct 1 14:48:19 2020
@@ -107,6 +107,8 @@
//! Flag if use "random" paragraphs, taken from GUI.
bool randomize();
+protected:
+ void changeEvent(QEvent *e) override;
private:
QCheckBox* appendCheckBox {nullptr};
@@ -129,8 +131,6 @@
//! all lorems with Public Name -> filename structure
QMap<QString,QString> availableLorems;
- virtual void changeEvent(QEvent *e);
-
protected slots:
void languageChange();
Modified: trunk/Scribus/scribus/ui/marksmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/marksmanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/marksmanager.h (original)
+++ trunk/Scribus/scribus/ui/marksmanager.h Thu Oct 1 14:48:19 2020
@@ -17,8 +17,10 @@
explicit MarksManager(QWidget *parent = nullptr, const char *name = "MarksManager");
~MarksManager();
- virtual void changeEvent(QEvent *e);
void updateListView();
+
+protected:
+ void changeEvent(QEvent *e) override;
private:
ScribusDoc* m_Doc;
Modified: trunk/Scribus/scribus/ui/measurements.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/measurements.h
==============================================================================
--- trunk/Scribus/scribus/ui/measurements.h (original)
+++ trunk/Scribus/scribus/ui/measurements.h Thu Oct 1 14:48:19 2020
@@ -19,8 +19,8 @@
Measurements( QWidget* parent );
~Measurements() {};
- virtual void changeEvent(QEvent *e);
-
+protected:
+ void changeEvent(QEvent *e) override;
public slots:
void setValues(double x1, double y1, double x2, double y2, double angle, double length);
Modified: trunk/Scribus/scribus/ui/nodeeditpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/nodeeditpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.h (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.h Thu Oct 1 14:48:19 2020
@@ -133,17 +133,17 @@
void connectSignals();
void disconnectSignals();
- virtual void changeEvent(QEvent *e);
- virtual void closeEvent(QCloseEvent *);
+ void changeEvent(QEvent *e) override;
+ void closeEvent(QCloseEvent *) override;
- QVBoxLayout *vboxLayout;
- QVBoxLayout *vboxLayout1;
- QGridLayout *gridLayout;
- QGridLayout *gridLayout1;
- QGridLayout *gridLayout2;
+ QVBoxLayout *vboxLayout { nullptr };
+ QVBoxLayout *vboxLayout1 { nullptr };
+ QGridLayout *gridLayout { nullptr };
+ QGridLayout *gridLayout1 { nullptr };
+ QGridLayout *gridLayout2 { nullptr };
- ScribusDoc *m_doc;
- ScribusView *m_view;
+ ScribusDoc *m_doc { nullptr };
+ ScribusView *m_view { nullptr };
double unitRatio;
double xPos;
Modified: trunk/Scribus/scribus/ui/notesstyleseditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/notesstyleseditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/notesstyleseditor.h (original)
+++ trunk/Scribus/scribus/ui/notesstyleseditor.h Thu Oct 1 14:48:19 2020
@@ -17,8 +17,10 @@
explicit NotesStylesEditor(QWidget* parent = nullptr, const char *name = "notesStylesEditor");
~NotesStylesEditor();
- virtual void changeEvent(QEvent *e);
void updateNSList();
+
+protected:
+ void changeEvent(QEvent *e) override;
private:
ScribusDoc *m_Doc;
Modified: trunk/Scribus/scribus/ui/outlinepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/outlinepalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.h (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.h Thu Oct 1 14:48:19 2020
@@ -60,8 +60,6 @@
public:
OutlinePalette( QWidget* parent );
- virtual void changeEvent(QEvent *e);
-
// void resizeEvent(QResizeEvent *r);
void setMainWindow(ScribusMainWindow *mw);
void setDoc(ScribusDoc *);
@@ -99,17 +97,20 @@
void slotDoubleClick(QTreeWidgetItem* ite, int col);
protected:
+ void changeEvent(QEvent *e) override;
+
void filterTree();
void clearPalette();
void createContextMenu(PageItem *currItem, double, double);
- QWidget* containerWidget;
- OutlineWidget* reportDisplay;
- QTreeWidgetItem* freeObjects;
- QTreeWidgetItem* rootObject;
- QTreeWidgetItem* currentObject;
- QLabel* filterLabel;
- QLineEdit* filterEdit;
- ScribusMainWindow* m_MainWindow;
+
+ QWidget* containerWidget { nullptr };
+ OutlineWidget* reportDisplay { nullptr };
+ QTreeWidgetItem* freeObjects { nullptr };
+ QTreeWidgetItem* rootObject { nullptr };
+ QTreeWidgetItem* currentObject { nullptr };
+ QLabel* filterLabel { nullptr };
+ QLineEdit* filterEdit { nullptr };
+ ScribusMainWindow* m_MainWindow { nullptr };
QPixmap textIcon;
QPixmap imageIcon;
QPixmap latexIcon;
@@ -129,8 +130,8 @@
QPixmap annotLinkIcon;
QPixmap annot3DIcon;
QPixmap groupIcon;
- bool selectionTriggered;
- ScribusDoc *currDoc;
+ bool selectionTriggered { false };
+ ScribusDoc *currDoc { nullptr };
};
#endif // TREE_H
Modified: trunk/Scribus/scribus/ui/pagepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/pagepalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette.h (original)
+++ trunk/Scribus/scribus/ui/pagepalette.h Thu Oct 1 14:48:19 2020
@@ -48,7 +48,7 @@
ScribusView *m_view;
ScribusMainWindow *m_scMW;
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
public slots:
void setView(ScribusView *view);
Modified: trunk/Scribus/scribus/ui/pagepalette_pages.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/pagepalette_pages.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.h (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.h Thu Oct 1 14:48:19 2020
@@ -33,8 +33,9 @@
public:
PagePalette_Pages(QWidget* parent);
~PagePalette_Pages() {};
-
- virtual void changeEvent(QEvent *e);
+
+protected:
+ void changeEvent(QEvent *e) override;
public slots:
void setView(ScribusView *view);
@@ -63,8 +64,8 @@
void gotoPage(int);
protected:
- ScribusView *currView;
- ScribusMainWindow *m_scMW;
+ ScribusView *currView { nullptr};
+ ScribusMainWindow *m_scMW { nullptr};
QList<SeItem*> pageList;
QPixmap pix;
Modified: trunk/Scribus/scribus/ui/patternpropsdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/patternpropsdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/patternpropsdialog.h (original)
+++ trunk/Scribus/scribus/ui/patternpropsdialog.h Thu Oct 1 14:48:19 2020
@@ -42,19 +42,19 @@
public:
PatternPropsDialog(QWidget* parent, int unitIndex, bool isStroke);
~PatternPropsDialog() {};
- virtual void changeEvent(QEvent *e);
- ScrSpinBox* spinXoffset;
- ScrSpinBox* spinYoffset;
- ScrSpinBox* spinXscaling;
- ScrSpinBox* spinYscaling;
- ScrSpinBox* spinAngle;
- ScrSpinBox* spinXSkew;
- ScrSpinBox* spinYSkew;
- ScrSpinBox* spinSpacing;
- QToolButton* FlipH;
- QToolButton* FlipV;
- LinkButton* keepScaleRatio;
- bool forStroke;
+
+ ScrSpinBox* spinXoffset { nullptr };
+ ScrSpinBox* spinYoffset { nullptr };
+ ScrSpinBox* spinXscaling { nullptr };
+ ScrSpinBox* spinYscaling { nullptr };
+ ScrSpinBox* spinAngle { nullptr };
+ ScrSpinBox* spinXSkew { nullptr };
+ ScrSpinBox* spinYSkew { nullptr };
+ ScrSpinBox* spinSpacing { nullptr };
+ QToolButton* FlipH { nullptr };
+ QToolButton* FlipV { nullptr };
+ LinkButton* keepScaleRatio { nullptr };
+ bool forStroke { false };
public slots:
void languageChange();
@@ -68,28 +68,30 @@
void NewPatternPropsS(double, double, double, double, double, double, double, double, bool, bool);
protected:
- QGroupBox* groupOffset;
- QLabel* textLabel1;
- QLabel* textLabel2;
- QGroupBox* groupScale;
- QLabel* textLabel5;
- QLabel* textLabel6;
- QGroupBox* groupRotation;
- QLabel* textLabel7;
- QGroupBox* groupSkew;
- QLabel* textLabel8;
- QLabel* textLabel9;
- QLabel* textLabel15;
- QGroupBox* groupSpace;
- QLabel* textLabel20;
- QVBoxLayout* frame3Layout;
- QHBoxLayout* groupOffsetLayout;
- QGridLayout* groupScaleLayout;
- QGridLayout* groupSkewLayout;
- QHBoxLayout* groupRotationLayout;
- QHBoxLayout* groupSpaceLayout;
- QPushButton* buttonOk;
- QHBoxLayout* buttonLayout;
- QHBoxLayout* groupFlipLayout;
+ QGroupBox* groupOffset { nullptr };
+ QLabel* textLabel1 { nullptr };
+ QLabel* textLabel2 { nullptr };
+ QGroupBox* groupScale { nullptr };
+ QLabel* textLabel5 { nullptr };
+ QLabel* textLabel6 { nullptr };
+ QGroupBox* groupRotation { nullptr };
+ QLabel* textLabel7 { nullptr };
+ QGroupBox* groupSkew { nullptr };
+ QLabel* textLabel8 { nullptr };
+ QLabel* textLabel9 { nullptr };
+ QLabel* textLabel15 { nullptr };
+ QGroupBox* groupSpace { nullptr };
+ QLabel* textLabel20 { nullptr };
+ QVBoxLayout* frame3Layout { nullptr };
+ QHBoxLayout* groupOffsetLayout { nullptr };
+ QGridLayout* groupScaleLayout { nullptr };
+ QGridLayout* groupSkewLayout { nullptr };
+ QHBoxLayout* groupRotationLayout { nullptr };
+ QHBoxLayout* groupSpaceLayout { nullptr };
+ QPushButton* buttonOk { nullptr };
+ QHBoxLayout* buttonLayout { nullptr };
+ QHBoxLayout* groupFlipLayout { nullptr };
+
+ void changeEvent(QEvent *e) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/preferencesdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/preferencesdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/preferencesdialog.h (original)
+++ trunk/Scribus/scribus/ui/preferencesdialog.h Thu Oct 1 14:48:19 2020
@@ -58,7 +58,6 @@
PreferencesDialog(QWidget* parent, ApplicationPrefs& prefsData, ScribusDoc *doc=nullptr);
~PreferencesDialog();
- virtual void changeEvent(QEvent *e);
ApplicationPrefs prefs() const { return localPrefs; }
void getResizeDocumentPages(bool &resizePages, bool &resizeMasterPages, bool &resizePageMargins, bool &resizeMasterPageMargins);
@@ -86,6 +85,8 @@
/*! \brief Scans plugins for those that want to add a prefs widget and
hooks them up to the dialog. */
void addPlugins();
+
+ void changeEvent(QEvent *e) override;
Prefs_ColorManagement *prefs_ColorManagement {nullptr};
Prefs_Display *prefs_Display {nullptr};
Modified: trunk/Scribus/scribus/ui/prefs_printer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/prefs_printer.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_printer.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_printer.cpp Thu Oct 1 14:48:19 2020
@@ -74,7 +74,7 @@
altPrinterCmdLineEdit->setText(prefs->get("Command", ""));
outputComboBox->setCurrentIndex(prefs->getInt("Separations", 0));
postscriptPrintToColorComboBox->setCurrentIndex(prefs->getInt("PrintColor", 0));
- postscriptLevelComboBox->setCurrentIndex(prefs->getInt("PSLevel", 3)-1);
+ postscriptLevelComboBox->setCurrentIndex(prefs->getInt("PSLevel", 3) - 1);
pageMirrorHorizontallyCheckBox->setChecked(prefs->getBool("MirrorH", false));
pageMirrorVerticallyCheckBox->setChecked(prefs->getBool("MirrorV", false));
setMediaSizeCheckBox->setChecked(prefs->getBool("doDev", false));
Modified: trunk/Scribus/scribus/ui/propertiespalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertiespalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.h Thu Oct 1 14:48:19 2020
@@ -54,9 +54,6 @@
PropertiesPalette(QWidget* parent);
~PropertiesPalette() {}
- virtual void changeEvent(QEvent *e);
- virtual void closeEvent(QCloseEvent *closeEvent);
-
void endPatchAdd();
void updateColorSpecialGradient();
void updateColorList();
@@ -75,6 +72,10 @@
PropertiesPalette_XYZ* xyzPal {nullptr};
ColorPalette *colorPalette {nullptr};
TransparencyPalette *transparencyPalette {nullptr};
+
+protected:
+ void changeEvent(QEvent *e) override;
+ void closeEvent(QCloseEvent *closeEvent) override;
private:
PageItem* currentItemFromSelection();
Modified: trunk/Scribus/scribus/ui/propertiespalette_group.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertiespalette_group.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.h Thu Oct 1 14:48:19 2020
@@ -27,8 +27,6 @@
PropertiesPalette_Group(QWidget* parent);
~PropertiesPalette_Group() {};
- virtual void changeEvent(QEvent *e);
-
void showTextFlowMode(PageItem::TextFlowMode mode);
void updateColorList();
@@ -44,8 +42,9 @@
ScGuardedPtr<ScribusDoc> m_doc;
Selection* m_tmpSelection {nullptr};
+ void changeEvent(QEvent *e) override;
+
private:
-
PageItem* currentItemFromSelection();
public slots:
Modified: trunk/Scribus/scribus/ui/propertiespalette_image.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertiespalette_image.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.h Thu Oct 1 14:48:19 2020
@@ -30,15 +30,12 @@
PropertiesPalette_Image(QWidget* parent);
~PropertiesPalette_Image() {};
- virtual void changeEvent(QEvent *e);
-
bool userActionOn();
void updateProfileList();
void showCMSOptions();
protected:
-
bool m_haveDoc {false};
bool m_haveItem {false};
bool m_userActionOn {false};
@@ -52,6 +49,8 @@
UserActionSniffer *userActionSniffer;
void installSniffer(ScrSpinBox *spinBox);
void installSniffer(QSpinBox *spinBox);
+
+ void changeEvent(QEvent *e) override;
private:
Modified: trunk/Scribus/scribus/ui/propertiespalette_line.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertiespalette_line.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.h Thu Oct 1 14:48:19 2020
@@ -28,8 +28,6 @@
PropertiesPalette_Line(QWidget* parent);
~PropertiesPalette_Line() {delete lineStyles->itemDelegate();};
- virtual void changeEvent(QEvent *e);
-
void updateLineStyles();
void updateArrowStyles();
@@ -43,8 +41,9 @@
ScribusMainWindow* m_ScMW {nullptr};
ScGuardedPtr<ScribusDoc> m_doc;
+ void changeEvent(QEvent *e) override;
+
private:
-
PageItem* currentItemFromSelection();
void updateArrowStyles(ScribusDoc *doc);
void updateLineStyles(ScribusDoc *doc);
@@ -69,7 +68,6 @@
void localeChange();
private slots:
-
void handleLineWidth();
void handleLineStyle();
void handleLineJoin();
Modified: trunk/Scribus/scribus/ui/propertiespalette_shadow.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertiespalette_shadow.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shadow.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shadow.h Thu Oct 1 14:48:19 2020
@@ -26,11 +26,9 @@
PropertiesPalette_Shadow(QWidget* parent);
~PropertiesPalette_Shadow() {};
- virtual void changeEvent(QEvent *e);
void updateColorList();
private:
-
PageItem* currentItemFromSelection();
public slots:
@@ -72,6 +70,8 @@
PageItem *m_item {nullptr};
ScribusMainWindow* m_ScMW {nullptr};
ScGuardedPtr<ScribusDoc> m_doc;
+
+ void changeEvent(QEvent *e) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.h Thu Oct 1 14:48:19 2020
@@ -31,8 +31,6 @@
PropertiesPalette_Shape(QWidget* parent);
~PropertiesPalette_Shape() {};
- virtual void changeEvent(QEvent *e);
-
void setCustomShapeIcon(int submode);
void setLocked(bool isLocked);
void setSizeLocked(bool isLocked);
@@ -48,6 +46,8 @@
ScGuardedPtr<ScribusDoc> m_doc;
Selection* m_tmpSelection {nullptr};
+
+ void changeEvent(QEvent *e) override;
private:
PageItem* currentItemFromSelection();
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertiespalette_text.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.h Thu Oct 1 14:48:19 2020
@@ -39,8 +39,6 @@
public:
PropertiesPalette_Text(QWidget* parent);
~PropertiesPalette_Text() {}
-
- virtual void changeEvent(QEvent *e);
void updateColorList();
@@ -57,6 +55,8 @@
PageItem *m_item {nullptr};
ScribusMainWindow* m_ScMW {nullptr};
ScGuardedPtr<ScribusDoc> m_doc;
+
+ void changeEvent(QEvent *e) override;
private:
PageItem* currentItemFromSelection();
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.h Thu Oct 1 14:48:19 2020
@@ -31,8 +31,6 @@
public:
PropertiesPalette_XYZ(QWidget* parent);
~PropertiesPalette_XYZ() {};
-
- virtual void changeEvent(QEvent *e);
/** @brief Returns true if there is a user action going on at the moment of call. */
bool userActionOn(); // not yet implemented!!! This is needed badly.
@@ -43,7 +41,6 @@
void setLineMode(int lineMode);
private:
-
PageItem* currentItemFromSelection();
public slots:
@@ -112,6 +109,8 @@
bool _userActionOn;
UserActionSniffer *userActionSniffer;
void installSniffer(ScrSpinBox *spinBox);
+
+ void changeEvent(QEvent *e) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.h Thu Oct 1 14:48:19 2020
@@ -38,7 +38,7 @@
void configureWidgets();
void setCurrentItem(PageItem *item);
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: trunk/Scribus/scribus/ui/propertywidget_distance.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_distance.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.h Thu Oct 1 14:48:19 2020
@@ -36,7 +36,7 @@
void configureWidgets();
void setCurrentItem(PageItem *item);
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: trunk/Scribus/scribus/ui/propertywidget_flop.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_flop.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_flop.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_flop.h Thu Oct 1 14:48:19 2020
@@ -31,10 +31,9 @@
~PropertyWidget_Flop() {};
protected:
-
ScGuardedPtr<ScribusDoc> m_doc;
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
public slots:
Modified: trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h Thu Oct 1 14:48:19 2020
@@ -35,7 +35,7 @@
void configureWidgets();
void initWidgets();
void setCurrentItem(PageItem *item);
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
quint64 featureFlags();
Modified: trunk/Scribus/scribus/ui/propertywidget_hyphenation.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_hyphenation.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_hyphenation.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_hyphenation.h Thu Oct 1 14:48:19 2020
@@ -32,7 +32,7 @@
void configureWidgets();
void setCurrentItem(PageItem *item);
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: trunk/Scribus/scribus/ui/propertywidget_optmargins.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_optmargins.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_optmargins.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_optmargins.h Thu Oct 1 14:48:19 2020
@@ -36,7 +36,7 @@
void configureWidgets();
void setCurrentItem(PageItem *item);
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: trunk/Scribus/scribus/ui/propertywidget_orphans.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_orphans.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_orphans.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_orphans.h Thu Oct 1 14:48:19 2020
@@ -18,14 +18,13 @@
Q_OBJECT
public:
-
PropertyWidget_Orphans(QWidget* parent);
~PropertyWidget_Orphans() {};
void updateStyle(const ParagraphStyle& newCurrent);
protected:
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
public slots:
void languageChange();
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.h Thu Oct 1 14:48:19 2020
@@ -40,7 +40,7 @@
void configureWidgets();
void setCurrentItem(PageItem *item);
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
void handleChanges(PageItem* item, ParagraphStyle& newStyle);
public slots:
Modified: trunk/Scribus/scribus/ui/propertywidget_pathtext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_pathtext.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pathtext.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pathtext.h Thu Oct 1 14:48:19 2020
@@ -36,7 +36,7 @@
void configureWidgets(void);
void setCurrentItem(PageItem *item);
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.h Thu Oct 1 14:48:19 2020
@@ -35,7 +35,7 @@
void configureWidgets();
- virtual void changeEvent(QEvent *e);
+ void changeEvent(QEvent *e) override;
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: trunk/Scribus/scribus/ui/resourcemanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/resourcemanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.h (original)
+++ trunk/Scribus/scribus/ui/resourcemanager.h Thu Oct 1 14:48:19 2020
@@ -33,8 +33,6 @@
#include "scribusstructs.h"
#include "ui_resourcemanagerbase.h"
-
-
class SCRIBUS_API ResourceManager : public QDialog, Ui::ResourceManagerBase
{
Q_OBJECT
@@ -54,7 +52,7 @@
~ResourceManager() {};
//events:
- //virtual void changeEvent(QEvent *e);
+ //void changeEvent(QEvent *e) override;
public slots:
void languageChange();
Modified: trunk/Scribus/scribus/ui/scdockpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/scdockpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.h (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.h Thu Oct 1 14:48:19 2020
@@ -42,6 +42,7 @@
public:
ScDockPalette( QWidget * parent = nullptr, const QString& prefsContext = QString(), Qt::WindowFlags f = Qt::WindowFlags() );
~ScDockPalette() {}
+
/** @brief Sample way to grab keystrokes, simply calls superclass at this point */
//virtual void keyPressEvent(QKeyEvent *keyEvent);
virtual void hide();
@@ -65,11 +66,11 @@
void storeDockState();
/** @brief Restore the geometry of the window when showing it. */
- virtual void showEvent(QShowEvent *showEvent);
+ void showEvent(QShowEvent *showEvent) override;
/** @brief Captures the close event and changes it to hide */
- virtual void closeEvent(QCloseEvent *closeEvent);
+ void closeEvent(QCloseEvent *closeEvent) override;
/** @brief Stores the geometry of the window when hiding. */
- virtual void hideEvent(QHideEvent* hideEvent);
+ void hideEvent(QHideEvent* hideEvent) override;
PrefsContext* m_palettePrefs {nullptr};
QString m_prefsContextName;
Modified: trunk/Scribus/scribus/ui/scinputdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/scinputdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/scinputdialog.h (original)
+++ trunk/Scribus/scribus/ui/scinputdialog.h Thu Oct 1 14:48:19 2020
@@ -29,8 +29,6 @@
public:
ScInputDialog( QWidget* parent = nullptr, const char* name = 0, bool modal = false);
~ScInputDialog(){};
-
- virtual void changeEvent(QEvent *e);
QLabel* entryLabel;
ScrSpinBox* entrySpin;
@@ -47,6 +45,8 @@
QHBoxLayout* labelEntryLayout;
QHBoxLayout* buttonLayout;
+ void changeEvent(QEvent *e) override;
+
protected slots:
void languageChange();
};
Modified: trunk/Scribus/scribus/ui/scrpalettebase.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/scrpalettebase.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.cpp (original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.cpp Thu Oct 1 14:48:19 2020
@@ -40,9 +40,7 @@
ScrPaletteBase::ScrPaletteBase( QWidget * parent, const QString& prefsContext, bool modal, Qt::WindowFlags f)
: QDialog ( parent, f | Qt::Tool | Qt::CustomizeWindowHint
| Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint
- | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint ),
- m_palettePrefs(nullptr),
- m_visibleOnStartup(false)
+ | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint )
{
if (PrefsManager::instance().appPrefs.uiPrefs.useSmallWidgets)
{
Modified: trunk/Scribus/scribus/ui/scrpalettebase.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/scrpalettebase.h
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.h (original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.h Thu Oct 1 14:48:19 2020
@@ -42,8 +42,7 @@
public:
ScrPaletteBase( QWidget * parent = nullptr, const QString& prefsContext = QString(), bool modal = false, Qt::WindowFlags f = Qt::WindowFlags());
~ScrPaletteBase() {}
- /** @brief Sample way to grab keystrokes, simply calls superclass at this point */
- //virtual void keyPressEvent(QKeyEvent *keyEvent);
+
virtual void hide();
void startup();
@@ -66,19 +65,22 @@
void storeVisibility(bool);
/** @brief Restore the geometry of the window when showing it. */
- virtual void showEvent(QShowEvent *showEvent);
+ void showEvent(QShowEvent *showEvent) override;
/** @brief Captures the close event and changes it to hide */
- virtual void closeEvent(QCloseEvent *closeEvent);
+ void closeEvent(QCloseEvent *closeEvent) override;
/** @brief Stores the geometry of the window when hiding. */
- virtual void hideEvent(QHideEvent*);
+ void hideEvent(QHideEvent*) override;
- PrefsContext* m_palettePrefs;
+ /** @brief Sample way to grab keystrokes, simply calls superclass at this point */
+ //void keyPressEvent(QKeyEvent *keyEvent) override;
+
+ PrefsContext* m_palettePrefs { nullptr };
QString m_prefsContextName;
- bool m_visibleOnStartup;
- QWidget* m_originalParent;
- QWidget* m_tempParent;
+ bool m_visibleOnStartup { false };
+ QWidget* m_originalParent { nullptr };
+ QWidget* m_tempParent { nullptr };
- protected slots:
+protected slots:
virtual void reject();
};
#endif
Modified: trunk/Scribus/scribus/ui/shortcutwidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/shortcutwidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/shortcutwidget.h (original)
+++ trunk/Scribus/scribus/ui/shortcutwidget.h Thu Oct 1 14:48:19 2020
@@ -25,13 +25,7 @@
public:
ShortcutWidget(QWidget* parent = nullptr);
~ShortcutWidget();
-
-
- virtual void changeEvent(QEvent *e);
- bool event( QEvent* ev );
- void keyPressEvent(QKeyEvent *k);
- void keyReleaseEvent(QKeyEvent *k);
void setShortcut(const QString &shortcut);
void setAllowedModifiers(int allowed, int required);
static QString getKeyText(int KeyC);
@@ -40,14 +34,6 @@
public slots:
void setKeyText();
void setNoKey();
-
-signals:
- /**
- * @brief emitted when a shrotcut is changed.
- *
- * Parameter will be QString() when No key is used
- */
- void newKey(const QString&);
protected:
int keyCode;
@@ -58,6 +44,20 @@
QString Part4;
int requiredModifiers;
int allowedModifiers;
+
+ void changeEvent(QEvent *e) override;
+
+ bool event(QEvent* ev) override;
+ void keyPressEvent(QKeyEvent *k) override;
+ void keyReleaseEvent(QKeyEvent *k) override;
+
+signals:
+ /**
+ * @brief emitted when a shrotcut is changed.
+ *
+ * Parameter will be QString() when No key is used
+ */
+ void newKey(const QString&);
};
#endif
Modified: trunk/Scribus/scribus/ui/smcellstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/smcellstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.h Thu Oct 1 14:48:19 2020
@@ -31,7 +31,6 @@
~SMCellStyleWidget();
void setDoc(ScribusDoc* doc);
- virtual void changeEvent(QEvent *e);
/**
* Shows attributes for a single cell style.
@@ -68,6 +67,9 @@
void fillFillColorCombo(ColorList &colors);
void showColors(const QList<CellStyle*> &cellStyles);
+protected:
+ void changeEvent(QEvent *e) override;
+
private:
ScribusDoc * m_Doc = nullptr;
Modified: trunk/Scribus/scribus/ui/smcstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/smcstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.h Thu Oct 1 14:48:19 2020
@@ -21,8 +21,6 @@
public:
SMCStyleWidget(QWidget* parent = nullptr);
~SMCStyleWidget();
-
- virtual void changeEvent(QEvent *e);
void setDoc(ScribusDoc* doc);
void show(CharStyle *cstyle, QList<CharStyle> &cstyles, const QString &defLang, int unitIndex);
@@ -32,6 +30,9 @@
void fillColorCombo(ColorList &colors);
void languageChange();
void clearAll();
+
+protected:
+ void changeEvent(QEvent *e) override;
private:
//QMap<QString, QString> m_langMap;
Modified: trunk/Scribus/scribus/ui/smfontfeatures.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/smfontfeatures.h
==============================================================================
--- trunk/Scribus/scribus/ui/smfontfeatures.h (original)
+++ trunk/Scribus/scribus/ui/smfontfeatures.h Thu Oct 1 14:48:19 2020
@@ -39,7 +39,6 @@
SMFontFeatures(QWidget *parent);
~SMFontFeatures(){}
- virtual void changeEvent(QEvent *e);
void languageChange();
void setFontFeatures(const QString& s, QStringList fontFeaturesList);
@@ -54,6 +53,8 @@
protected:
void connectSignals();
void disconnectSignals();
+
+ void changeEvent(QEvent *e) override;
private:
void hideAllFontFeatures();
Modified: trunk/Scribus/scribus/ui/smlinestyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/smlinestyle.h
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestyle.h (original)
+++ trunk/Scribus/scribus/ui/smlinestyle.h Thu Oct 1 14:48:19 2020
@@ -24,8 +24,6 @@
SMLineStyle();
~SMLineStyle();
- virtual void changeEvent(QEvent *e);
-
QTabWidget* widget();
QString typeNamePlural();
QString typeNameSingular();
@@ -47,6 +45,9 @@
QString getUniqueName(const QString &name);
void languageChange();
void unitChange();
+
+protected:
+ virtual void changeEvent(QEvent *e);
signals:
void deleteDone();
Modified: trunk/Scribus/scribus/ui/smlinestylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/smlinestylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smlinestylewidget.h Thu Oct 1 14:48:19 2020
@@ -26,10 +26,11 @@
SMLineStyleWidget();
~SMLineStyleWidget();
- virtual void changeEvent(QEvent *e);
-
void showStyle(const multiLine &lineStyle, ColorList &colorList, int subLine = 0);
void unitChange(int unitIndex);
+
+protected:
+ void changeEvent(QEvent *e) override;
private:
multiLine m_currentStyle;
Modified: trunk/Scribus/scribus/ui/smpstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/smpstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.h Thu Oct 1 14:48:19 2020
@@ -25,8 +25,6 @@
public:
SMPStyleWidget(ScribusDoc *doc, StyleSet<CharStyle> *cstyles);
~SMPStyleWidget();
-
- virtual void changeEvent(QEvent *e);
void show(ParagraphStyle *pstyle, QList<ParagraphStyle> &pstyles, QList<CharStyle> &cstyles, int unitIndex, const QString &defLang);
void show(QList<ParagraphStyle*> &pstyles, QList<ParagraphStyle> &pstylesAll, QList<CharStyle> &cstyles, int unitIndex, const QString &defLang);
@@ -35,6 +33,9 @@
void languageChange();
void unitChange(double oldRatio, double newRatio, int unitIndex);
void setDoc(ScribusDoc* doc);
+
+protected:
+ void changeEvent(QEvent *e) override;
private:
bool m_hasParent = false;
Modified: trunk/Scribus/scribus/ui/smtablestylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/smtablestylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.h Thu Oct 1 14:48:19 2020
@@ -30,7 +30,6 @@
~SMTableStyleWidget();
void setDoc(ScribusDoc* doc);
- virtual void changeEvent(QEvent *e);
/**
* Shows attributes for a single table style.
@@ -67,6 +66,9 @@
void fillFillColorCombo(ColorList &colors);
void showColors(const QList<TableStyle*> &tableStyles);
+protected:
+ void changeEvent(QEvent *e) override;
+
private:
ScribusDoc * m_Doc = nullptr;
Modified: trunk/Scribus/scribus/ui/spiralvectordialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/spiralvectordialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/spiralvectordialog.h (original)
+++ trunk/Scribus/scribus/ui/spiralvectordialog.h Thu Oct 1 14:48:19 2020
@@ -44,7 +44,9 @@
public:
SpiralVectorDialog( QWidget* parent);
~SpiralVectorDialog() {};
- virtual void changeEvent(QEvent *e);
+
+protected:
+ void changeEvent(QEvent *e) override;
public slots:
void languageChange();
Modified: trunk/Scribus/scribus/ui/storyeditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/storyeditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.h (original)
+++ trunk/Scribus/scribus/ui/storyeditor.h Thu Oct 1 14:48:19 2020
@@ -237,8 +237,6 @@
SToolBColorF(QMainWindow* parent, ScribusDoc *doc);
~SToolBColorF() {};
- virtual void changeEvent(QEvent *e);
-
void setCurrentDocument(ScribusDoc *doc);
QLabel* FillIcon { nullptr };
@@ -248,6 +246,9 @@
QAction* txFillAction { nullptr };
QAction* fillIconAction { nullptr };
+protected:
+ void changeEvent(QEvent *e) override;
+
public slots:
void SetColor(int c);
void SetShade(double s);
@@ -266,8 +267,6 @@
public:
SToolBColorS(QMainWindow* parent, ScribusDoc *doc);
~SToolBColorS() {};
-
- virtual void changeEvent(QEvent *e);
void setCurrentDocument(ScribusDoc *doc);
@@ -278,6 +277,8 @@
QAction* txStrokeAction { nullptr };
QAction* pm1Action { nullptr };
+protected:
+ void changeEvent(QEvent *e) override;
public slots:
void SetColor(int c);
@@ -297,8 +298,6 @@
public:
SToolBStyle(QMainWindow* parent);
~SToolBStyle() {};
-
- virtual void changeEvent(QEvent *e);
StyleSelect* SeStyle { nullptr };
QLabel* trackingLabel { nullptr };
@@ -306,6 +305,9 @@
QAction* seStyleAction { nullptr };
QAction* trackingLabelAction { nullptr };
QAction* extraAction { nullptr };
+
+protected:
+ void changeEvent(QEvent *e) override;
public slots:
void newStrikeHandler();
@@ -339,8 +341,6 @@
SToolBAlign(QMainWindow* parent);
~SToolBAlign() {};
- virtual void changeEvent(QEvent *e);
-
AlignSelect* GroupAlign { nullptr };
DirectionSelect* GroupDirection { nullptr };
ParaStyleComboBox *paraStyleCombo { nullptr };
@@ -348,6 +348,9 @@
QAction* groupDirectionAction { nullptr };
QAction* paraStyleComboAction { nullptr };
+protected:
+ void changeEvent(QEvent *e) override;
+
public slots:
void SetAlign(int s);
void SetDirection(int s);
@@ -367,8 +370,6 @@
public:
SToolBFont(QMainWindow* parent);
~SToolBFont() {};
-
- virtual void changeEvent(QEvent *e);
FontCombo* Fonts { nullptr };
ScrSpinBox* charScaleH { nullptr };
@@ -376,6 +377,9 @@
QAction* fontsAction { nullptr };
QAction* chScaleHAction { nullptr };
QAction* chScaleVAction { nullptr };
+
+protected:
+ void changeEvent(QEvent *e) override;
public slots:
void SetFont(const QString& f);
@@ -411,8 +415,6 @@
StoryEditor( QWidget* parent );
// StoryEditor( QWidget* parent, ScribusDoc *docc, PageItem* ite );
~StoryEditor();
-
- virtual void changeEvent(QEvent *e);
void setCurrentDocumentAndItem(ScribusDoc *doc=nullptr, PageItem *item=nullptr);
void setSpellActive(bool ssa);
@@ -537,12 +539,14 @@
//! True when there were some glyphs inserted via charSelect
bool charSelectUsed { false };
- void showEvent(QShowEvent *);
- void hideEvent(QHideEvent *);
-
- void closeEvent(QCloseEvent *);
- void keyPressEvent (QKeyEvent * e);
- bool eventFilter( QObject* ob, QEvent* ev );
+ void changeEvent(QEvent *e) override;
+
+ void showEvent(QShowEvent *) override;
+ void hideEvent(QHideEvent *) override;
+
+ void closeEvent(QCloseEvent *) override;
+ void keyPressEvent (QKeyEvent * e) override;
+ bool eventFilter( QObject* ob, QEvent* ev ) override;
QHBoxLayout* StoryEd2Layout { nullptr };
QGridLayout* ButtonGroup1Layout { nullptr };
Modified: trunk/Scribus/scribus/ui/stylemanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/stylemanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.h (original)
+++ trunk/Scribus/scribus/ui/stylemanager.h Thu Oct 1 14:48:19 2020
@@ -27,8 +27,6 @@
public:
StyleManager(QWidget* parent = nullptr, const char *name = "StyleManager");
~StyleManager();
-
- virtual void changeEvent(QEvent *e);
void addStyle(StyleItem *item);
void updateColorList();
@@ -44,9 +42,10 @@
void closed();
protected:
- void hideEvent(QHideEvent *e);
- void closeEvent(QCloseEvent *e);
- void showEvent(QShowEvent *e);
+ void changeEvent(QEvent *e) override;
+ void hideEvent(QHideEvent *e) override;
+ void closeEvent(QCloseEvent *e) override;
+ void showEvent(QShowEvent *e) override;
private:
QList<StyleItem*> m_items;
Modified: trunk/Scribus/scribus/ui/styleselect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/styleselect.h
==============================================================================
--- trunk/Scribus/scribus/ui/styleselect.h (original)
+++ trunk/Scribus/scribus/ui/styleselect.h Thu Oct 1 14:48:19 2020
@@ -102,21 +102,19 @@
class SCRIBUS_API StyleSelect : public QWidget
{
-
Q_OBJECT
public:
StyleSelect(QWidget* parent);
~StyleSelect() {};
- virtual void changeEvent(QEvent *e);
-
void setStyle(int s);
int getStyle();
- ShadowValues* ShadowVal;
- OutlineValues* OutlineVal;
- UnderlineValues* UnderlineVal;
- StrikeValues* StrikeVal;
+
+ ShadowValues* ShadowVal { nullptr };
+ OutlineValues* OutlineVal { nullptr };
+ UnderlineValues* UnderlineVal { nullptr };
+ StrikeValues* StrikeVal { nullptr };
public slots:
void iconSetChange();
@@ -129,24 +127,26 @@
void State(int);
protected:
- QHBoxLayout* ssLayout;
- QToolButton* underlineButton;
- QToolButton* underlineWordButton;
- QToolButton* subscriptButton;
- QToolButton* superscriptButton;
- QToolButton* smallcapsButton;
- QToolButton* allcapsButton;
- QToolButton* strikeoutButton;
- QToolButton* outlineButton;
- QToolButton* shadowButton;
- QMenu* ShadowPop;
- QMenu* OutlinePop;
- QMenu* UnderlinePop;
- QMenu* StrikePop;
- QWidgetAction* StrikeValAct;
- QWidgetAction* ShadowValAct;
- QWidgetAction* OutlineValAct;
- QWidgetAction* UnderlineValAct;
+ QHBoxLayout* ssLayout { nullptr };
+ QToolButton* underlineButton { nullptr };
+ QToolButton* underlineWordButton { nullptr };
+ QToolButton* subscriptButton { nullptr };
+ QToolButton* superscriptButton { nullptr };
+ QToolButton* smallcapsButton { nullptr };
+ QToolButton* allcapsButton { nullptr };
+ QToolButton* strikeoutButton { nullptr };
+ QToolButton* outlineButton { nullptr };
+ QToolButton* shadowButton { nullptr };
+ QMenu* ShadowPop { nullptr };
+ QMenu* OutlinePop { nullptr };
+ QMenu* UnderlinePop { nullptr };
+ QMenu* StrikePop { nullptr };
+ QWidgetAction* StrikeValAct { nullptr };
+ QWidgetAction* ShadowValAct { nullptr };
+ QWidgetAction* OutlineValAct { nullptr };
+ QWidgetAction* UnderlineValAct { nullptr };
+
+ void changeEvent(QEvent *e) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/symbolpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/symbolpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/symbolpalette.h (original)
+++ trunk/Scribus/scribus/ui/symbolpalette.h Thu Oct 1 14:48:19 2020
@@ -83,8 +83,6 @@
void editingStart(QStringList names);
void editingFinished();
void updateSymbolList();
-
- virtual void changeEvent(QEvent *e);
public slots:
void handleContextMenue(QPoint p);
@@ -107,6 +105,8 @@
ScribusMainWindow *m_scMW;
QStringList editItemNames;
QListWidgetItem *m_item;
+
+ void changeEvent(QEvent *e) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/tabruler.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/tabruler.h
==============================================================================
--- trunk/Scribus/scribus/ui/tabruler.h (original)
+++ trunk/Scribus/scribus/ui/tabruler.h Thu Oct 1 14:48:19 2020
@@ -94,8 +94,6 @@
double wid = -1);
~Tabruler() {};
- virtual void changeEvent(QEvent *e);
-
virtual void setTabs(const QList<ParagraphStyle::TabRecord>& Tabs, int dEin);
QList<ParagraphStyle::TabRecord> getTabVals();
@@ -166,6 +164,8 @@
bool m_haveFirst;
double m_docUnitRatio;
+ void changeEvent(QEvent *e) override;
+
protected slots:
void iconSetChange();
void languageChange();
Modified: trunk/Scribus/scribus/ui/textpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/textpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/textpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/textpalette.cpp Thu Oct 1 14:48:19 2020
@@ -44,11 +44,6 @@
TextPalette::TextPalette( QWidget* parent) : ScDockPalette(parent, "TextPalette", Qt::WindowFlags())
{
undoManager = UndoManager::instance();
- m_ScMW=nullptr;
- m_doc=nullptr;
- m_haveDoc = false;
- m_haveItem = false;
- m_unitRatio = 1.0;
setObjectName(QString::fromLocal8Bit("TextPalette"));
/// setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
Modified: trunk/Scribus/scribus/ui/textpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/textpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/textpalette.h (original)
+++ trunk/Scribus/scribus/ui/textpalette.h Thu Oct 1 14:48:19 2020
@@ -35,9 +35,6 @@
TextPalette(QWidget* parent);
~TextPalette() {}
- virtual void changeEvent(QEvent *e);
- virtual void closeEvent(QCloseEvent *closeEvent);
-
void updateColorList();
void endPatchAdd();
@@ -47,10 +44,9 @@
// and if in ScribusView a groupTransaction has been started it must be also
// commmited
- PropertiesPalette_Text* textPal;
+ PropertiesPalette_Text* textPal { nullptr };
private:
-
PageItem* currentItemFromSelection();
public slots:
@@ -70,20 +66,22 @@
private slots:
void NewLineMode(int mode);
+protected:
+ ScribusMainWindow *m_ScMW { nullptr };
-protected:
- ScribusMainWindow *m_ScMW;
-
- bool m_haveDoc;
- bool m_haveItem;
- double m_unitRatio;
- int m_unitIndex;
- PageItem* m_item;
- UndoManager *undoManager;
+ bool m_haveDoc { false };
+ bool m_haveItem { false };
+ double m_unitRatio { 1.0 };
+ int m_unitIndex { 0 };
+ PageItem* m_item { nullptr };
+ UndoManager *undoManager { nullptr };
ScGuardedPtr<ScribusDoc> m_doc;
int idTextItem;
+
+ void changeEvent(QEvent *e) override;
+ void closeEvent(QCloseEvent *closeEvent) override;
};
#endif
Modified: trunk/Scribus/scribus/ui/unicodesearch.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/unicodesearch.h
==============================================================================
--- trunk/Scribus/scribus/ui/unicodesearch.h (original)
+++ trunk/Scribus/scribus/ui/unicodesearch.h Thu Oct 1 14:48:19 2020
@@ -121,15 +121,12 @@
UnicodeChooseButton(QWidget * parent);
~UnicodeChooseButton(){};
- virtual void changeEvent(QEvent *e);
-
-signals:
- //! \brief Signal transferring the chosen character as QString
- void chosenUnicode(const QString &);
-
public slots:
//! \brief Slot for changing language of GUI
void languageChange();
+
+protected:
+ void changeEvent(QEvent *e) override;
private:
/*! \brief UnicodeSearch reference.
@@ -150,6 +147,10 @@
void glyphSelected(const QString & hex);
// \brief Flush the cached m_searchDialog (destroy it).
// void deleteSearchDialog();
+
+signals:
+ //! \brief Signal transferring the chosen character as QString
+ void chosenUnicode(const QString &);
};
#endif
Modified: trunk/Scribus/scribus/ui/weldedit.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/ui/weldedit.h
==============================================================================
--- trunk/Scribus/scribus/ui/weldedit.h (original)
+++ trunk/Scribus/scribus/ui/weldedit.h Thu Oct 1 14:48:19 2020
@@ -43,10 +43,12 @@
public:
WeldEditDialog( QWidget* parent);
~WeldEditDialog() {};
- virtual void changeEvent(QEvent *e);
public slots:
void languageChange();
+
+protected:
+ void changeEvent(QEvent *e) override;
signals:
void modeMoveWeld();
Modified: trunk/Scribus/scribus/undogui.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24048&path=/trunk/Scribus/scribus/undogui.h
==============================================================================
--- trunk/Scribus/scribus/undogui.h (original)
+++ trunk/Scribus/scribus/undogui.h Thu Oct 1 14:48:19 2020
@@ -162,6 +162,7 @@
QMenu* redoMenu;
void updateUndoMenu();
void updateRedoMenu();
+
public:
/** @brief Creates a new UndoWidget instance. */
UndoWidget(QWidget* parent = nullptr, const char* name = 0);
@@ -174,13 +175,14 @@
/**
* @brief Update the scrActions
*/
- virtual void updateUndoActions();
+ void updateUndoActions() override;
private slots:
void undoClicked();
void redoClicked();
void undoMenuClicked(QAction *id);
void redoMenuClicked(QAction *id);
+
public slots:
/**
* @brief Insert a new undo item.
@@ -225,6 +227,7 @@
/** @brief Remove the last (oldest) item from the undo stack representation. */
void popBack();
+
signals:
/**
* @brief Emitted when undo is requested.
@@ -260,16 +263,39 @@
{
Q_OBJECT
+public:
+ /**
+ * @brief Creates a new UndoPalette instance.
+ *
+ * Creates a new UndoPalette instance. After creation of an UndoPalette it must
+ * be registered to the UndoManager with UndoManager's registerGui() method.
+ */
+ UndoPalette(QWidget* parent = nullptr, const char* name = 0);
+
+ /** @brief Destroys the widget */
+ ~UndoPalette();
+
+ /** @brief Empties the undo stack for this widget. */
+ void clear();
+ /**
+ * @brief Update the scrActions
+ */
+ void updateUndoActions() override;
+
+protected:
+ void changeEvent(QEvent *e) override;
+
private:
- QWidget* container;
- int currentSelection;
- int redoItems;
- QListWidget* undoList;
- QCheckBox* objectBox;
- QPushButton* undoButton;
- QPushButton* redoButton;
+ QWidget* container { nullptr };
+ int currentSelection { 0 };
+ int redoItems { 0 };
+ QListWidget* undoList { nullptr };
+ QCheckBox* objectBox { nullptr };
+ QPushButton* undoButton { nullptr };
+ QPushButton* redoButton { nullptr };
QKeySequence initialUndoKS;
QKeySequence initialRedoKS;
+
void updateList();
void removeRedoItems();
@@ -280,9 +306,9 @@
{
private:
/** @brief An icon for the undo target */
- QPixmap *targetpixmap;
+ QPixmap *targetpixmap { nullptr };
/** @brief An icon for the undo state (action) */
- QPixmap *actionpixmap;
+ QPixmap *actionpixmap { nullptr };
/** @brief Name of the target of the state (action) */
QString target;
/** @brief Undo action's name */
@@ -290,7 +316,8 @@
/** @brief Description of the action */
QString description;
/** @brief Does this item describe an undo action if false it's a redo action */
- bool isUndoAction_;
+ bool isUndoAction_ { true };
+
public:
/** @brief Create an empty UndoItem object */
UndoItem();
@@ -319,6 +346,7 @@
bool isUndoAction,
QListWidget* parent = nullptr);
~UndoItem();
+
/*void paint(QPainter *painter);
int height(const QListWidget*) const;
int width(const QListWidget*) const;*/
@@ -328,6 +356,57 @@
};
/******************************************************************************/
+
+public slots:
+ /** @brief Sets GUI strings on language change */
+ void languageChange();
+
+ /**
+ * @brief Insert a new undo item.
+ *
+ * Insert a new undo item. After an undoable action has happened and
+ * if this UndoGui is registered to the UndoManager this slot will
+ * be used to register the action to the widget.
+ * @param target Target of the undo action
+ * @param state State describing the action
+ */
+ void insertUndoItem(UndoObject* target, UndoState* state);
+
+ /**
+ * @brief Insert a new redo item.
+ * @param target Target of the redo action
+ * @param state State describing the action
+ */
+ void insertRedoItem(UndoObject* target, UndoState* state);
+
+ /**
+ * @brief Update undo stack representation with number of steps.
+ *
+ * When some other UndoGui subclass has received an undo request this
+ * slot is used to inform this UndoGui to update it's UndoStack
+ * representation.
+ * @param steps Number of steps to take
+ */
+ void updateUndo(int steps);
+
+ /**
+ * @brief Update redo stack representation with number of steps.
+ *
+ * When some other UndoGui subclass has received a redo request this
+ * slot is used to inform this UndoGui to update it's UndoStack
+ * representation.
+ * @param steps Number of steps to take
+ */
+ void updateRedo(int steps);
+
+ /** @brief Clear the redo action items. */
+ void clearRedo();
+
+ /** @brief Remove the last (oldest) item from the undo stack representation. */
+ void popBack();
+
+ /** @brief Receive prefsChanged() signal to update shortcuts. */
+ void updateFromPrefs();
private slots:
void undoClicked();
@@ -337,80 +416,7 @@
void removeToolTip();
void objectCheckBoxClicked(bool on);
-public:
- /**
- * @brief Creates a new UndoPalette instance.
- *
- * Creates a new UndoPalette instance. After creation of an UndoPalette it must
- * be registered to the UndoManager with UndoManager's registerGui() method.
- */
- UndoPalette(QWidget* parent = nullptr, const char* name = 0);
-
- /** @brief Destroys the widget */
- ~UndoPalette();
-
- virtual void changeEvent(QEvent *e);
-
- /** @brief Empties the undo stack for this widget. */
- void clear();
- /**
- * @brief Update the scrActions
- */
- virtual void updateUndoActions();
-
-public slots:
- /** @brief Sets GUI strings on language change */
- void languageChange();
-
- /**
- * @brief Insert a new undo item.
- *
- * Insert a new undo item. After an undoable action has happened and
- * if this UndoGui is registered to the UndoManager this slot will
- * be used to register the action to the widget.
- * @param target Target of the undo action
- * @param state State describing the action
- */
- void insertUndoItem(UndoObject* target, UndoState* state);
-
- /**
- * @brief Insert a new redo item.
- * @param target Target of the redo action
- * @param state State describing the action
- */
- void insertRedoItem(UndoObject* target, UndoState* state);
-
- /**
- * @brief Update undo stack representation with number of steps.
- *
- * When some other UndoGui subclass has received an undo request this
- * slot is used to inform this UndoGui to update it's UndoStack
- * representation.
- * @param steps Number of steps to take
- */
- void updateUndo(int steps);
-
- /**
- * @brief Update redo stack representation with number of steps.
- *
- * When some other UndoGui subclass has received a redo request this
- * slot is used to inform this UndoGui to update it's UndoStack
- * representation.
- * @param steps Number of steps to take
- */
- void updateRedo(int steps);
-
- /** @brief Clear the redo action items. */
- void clearRedo();
-
- /** @brief Remove the last (oldest) item from the undo stack representation. */
- void popBack();
-
- /** @brief Receive prefsChanged() signal to update shortcuts. */
- void updateFromPrefs();
-
signals:
-
/**
* @brief Emitted when undo behaviour should be changed from global undo
* @brief to object specific undo and other way around.
More information about the scribus-commit
mailing list