Minor: s/Q_DECL_OVERRIDE/override/

filters/asyexporter.h

@@ -19,10 +19,10 @@ class AsyExporter
 {
 public:
   ~AsyExporter();
-  QString exportToStatement() const Q_DECL_OVERRIDE;
-  QString menuEntryName() const Q_DECL_OVERRIDE;
-  QString menuIcon() const Q_DECL_OVERRIDE;
-  void run( const KigPart& doc, KigWidget& w ) Q_DECL_OVERRIDE;
+  QString exportToStatement() const override;
+  QString menuEntryName() const override;
+  QString menuIcon() const override;
+  void run( const KigPart& doc, KigWidget& w ) override;
 };
 
 #endif

filters/asyexporterimpvisitor.h

@@ -39,23 +39,23 @@ public:
     {
     }
   using ObjectImpVisitor::visit;
-  void visit( const LineImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const PointImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const TextImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const AngleImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const VectorImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const LocusImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const CircleImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const ConicImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const CubicImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const SegmentImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const RayImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const ArcImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const FilledPolygonImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const ClosedPolygonalImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const OpenPolygonalImp* imp ) Q_DECL_OVERRIDE;
-  void visit ( const BezierImp* imp ) Q_DECL_OVERRIDE;
-  void visit ( const RationalBezierImp* imp ) Q_DECL_OVERRIDE;
+  void visit( const LineImp* imp ) override;
+  void visit( const PointImp* imp ) override;
+  void visit( const TextImp* imp ) override;
+  void visit( const AngleImp* imp ) override;
+  void visit( const VectorImp* imp ) override;
+  void visit( const LocusImp* imp ) override;
+  void visit( const CircleImp* imp ) override;
+  void visit( const ConicImp* imp ) override;
+  void visit( const CubicImp* imp ) override;
+  void visit( const SegmentImp* imp ) override;
+  void visit( const RayImp* imp ) override;
+  void visit( const ArcImp* imp ) override;
+  void visit( const FilledPolygonImp* imp ) override;
+  void visit( const ClosedPolygonalImp* imp ) override;
+  void visit( const OpenPolygonalImp* imp ) override;
+  void visit ( const BezierImp* imp ) override;
+  void visit ( const RationalBezierImp* imp ) override;
 
   double unit;
 

filters/cabri-filter.h

@@ -30,8 +30,8 @@ class KigFilterCabri
 public:
   static KigFilterCabri* instance();
 
-  bool supportMime ( const QString& mime ) Q_DECL_OVERRIDE;
-  KigDocument* load ( const QString& fromfile ) Q_DECL_OVERRIDE;
+  bool supportMime ( const QString& mime ) override;
+  KigDocument* load ( const QString& fromfile ) override;
   
   friend class CabriReader;
 };

filters/cabri-utils.h

@@ -135,9 +135,9 @@ public:
   explicit CabriReader_v10( const KigFilterCabri* filter );
   virtual ~CabriReader_v10();
 
-  bool readWindowMetrics( QFile& f ) Q_DECL_OVERRIDE;
-  CabriObject* readObject( QFile& f ) Q_DECL_OVERRIDE;
-  void decodeStyle( CabriObject* obj, Qt::PenStyle& ps, Kig::PointStyle& pointType ) Q_DECL_OVERRIDE;
+  bool readWindowMetrics( QFile& f ) override;
+  CabriObject* readObject( QFile& f ) override;
+  void decodeStyle( CabriObject* obj, Qt::PenStyle& ps, Kig::PointStyle& pointType ) override;
 };
 
 class CabriReader_v12
@@ -153,9 +153,9 @@ public:
 
   static QColor translateColor( const QString& s );
 
-  bool readWindowMetrics( QFile& f ) Q_DECL_OVERRIDE;
-  CabriObject* readObject( QFile& f ) Q_DECL_OVERRIDE;
-  void decodeStyle( CabriObject* obj, Qt::PenStyle& ps, Kig::PointStyle& pointType ) Q_DECL_OVERRIDE;
+  bool readWindowMetrics( QFile& f ) override;
+  CabriObject* readObject( QFile& f ) override;
+  void decodeStyle( CabriObject* obj, Qt::PenStyle& ps, Kig::PointStyle& pointType ) override;
 };
 
 #endif

filters/drgeo-filter.h

@@ -24,8 +24,8 @@ protected:
 public:
   static KigFilterDrgeo* instance();
 
-  bool supportMime( const QString& mime ) Q_DECL_OVERRIDE;
-  KigDocument* load( const QString& file ) Q_DECL_OVERRIDE;
+  bool supportMime( const QString& mime ) override;
+  KigDocument* load( const QString& file ) override;
 private:
   KigDocument* importFigure( const QDomNode& f, const bool grid );
 };

filters/exporter.h

@@ -81,10 +81,10 @@ class ImageExporter
 {
 public:
   ~ImageExporter();
-  QString exportToStatement() const Q_DECL_OVERRIDE;
-  QString menuEntryName() const Q_DECL_OVERRIDE;
-  QString menuIcon() const Q_DECL_OVERRIDE;
-  void run( const KigPart& doc, KigWidget& w ) Q_DECL_OVERRIDE;
+  QString exportToStatement() const override;
+  QString menuEntryName() const override;
+  QString menuIcon() const override;
+  void run( const KigPart& doc, KigWidget& w ) override;
 };
 
 #endif

filters/geogebra-filter.h

@@ -22,8 +22,8 @@ class KigFilterGeogebra : public KigFilter
 {
 public:
     static KigFilterGeogebra* instance();
-    KigDocument* load ( const QString& fromfile ) Q_DECL_OVERRIDE;
-    bool supportMime ( const QString& mime ) Q_DECL_OVERRIDE;
+    KigDocument* load ( const QString& fromfile ) override;
+    bool supportMime ( const QString& mime ) override;
 
 protected:
     KigFilterGeogebra() {}

filters/kgeo-filter.h

@@ -24,8 +24,8 @@ class KigFilterKGeo
 {
 public:
   static KigFilterKGeo* instance();
-  bool supportMime ( const QString& mime ) Q_DECL_OVERRIDE;
-  KigDocument* load ( const QString& from ) Q_DECL_OVERRIDE;
+  bool supportMime ( const QString& mime ) override;
+  KigDocument* load ( const QString& from ) override;
 protected:
   KigFilterKGeo();
   ~KigFilterKGeo();

filters/kseg-filter.h

@@ -22,8 +22,8 @@ class KigFilterKSeg
 public:
   static KigFilterKSeg* instance();
 
-  bool supportMime ( const QString& mime ) Q_DECL_OVERRIDE;
-  KigDocument* load ( const QString& fromfile ) Q_DECL_OVERRIDE;
+  bool supportMime ( const QString& mime ) override;
+  KigDocument* load ( const QString& fromfile ) override;
 };
 
 #endif

filters/latexexporter.cc

@@ -91,23 +91,23 @@ public:
     {
     }
     using ObjectImpVisitor::visit;
-    void visit( const LineImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const PointImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const TextImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const AngleImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const VectorImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const LocusImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const CircleImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const ConicImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const CubicImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const SegmentImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const RayImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const ArcImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const FilledPolygonImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const ClosedPolygonalImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const OpenPolygonalImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const BezierImp* imp ) Q_DECL_OVERRIDE;
-    void visit( const RationalBezierImp* imp ) Q_DECL_OVERRIDE;
+    void visit( const LineImp* imp ) override;
+    void visit( const PointImp* imp ) override;
+    void visit( const TextImp* imp ) override;
+    void visit( const AngleImp* imp ) override;
+    void visit( const VectorImp* imp ) override;
+    void visit( const LocusImp* imp ) override;
+    void visit( const CircleImp* imp ) override;
+    void visit( const ConicImp* imp ) override;
+    void visit( const CubicImp* imp ) override;
+    void visit( const SegmentImp* imp ) override;
+    void visit( const RayImp* imp ) override;
+    void visit( const ArcImp* imp ) override;
+    void visit( const FilledPolygonImp* imp ) override;
+    void visit( const ClosedPolygonalImp* imp ) override;
+    void visit( const OpenPolygonalImp* imp ) override;
+    void visit( const BezierImp* imp ) override;
+    void visit( const RationalBezierImp* imp ) override;
 
     double unit;
 

filters/latexexporter.h

@@ -19,10 +19,10 @@ class LatexExporter
 {
 public:
   ~LatexExporter();
-  QString exportToStatement() const Q_DECL_OVERRIDE;
-  QString menuEntryName() const Q_DECL_OVERRIDE;
-  QString menuIcon() const Q_DECL_OVERRIDE;
-  void run( const KigPart& doc, KigWidget& w ) Q_DECL_OVERRIDE;
+  QString exportToStatement() const override;
+  QString menuEntryName() const override;
+  QString menuIcon() const override;
+  void run( const KigPart& doc, KigWidget& w ) override;
 };
 
 #endif

filters/native-filter.h

@@ -44,8 +44,8 @@ private:
 public:
   static KigFilterNative* instance();
 
-  bool supportMime( const QString& mime ) Q_DECL_OVERRIDE;
-  KigDocument* load( const QString& file ) Q_DECL_OVERRIDE;
+  bool supportMime( const QString& mime ) override;
+  KigDocument* load( const QString& file ) override;
   KigDocument* load( const QDomDocument& doc );
 
   bool save( const KigDocument& data, const QString& file );

filters/pgfexporterimpvisitor.h

@@ -41,23 +41,23 @@ public:
     {
     }
   using ObjectImpVisitor::visit;
-  void visit( const LineImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const PointImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const TextImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const AngleImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const VectorImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const LocusImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const CircleImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const ConicImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const CubicImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const SegmentImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const RayImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const ArcImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const FilledPolygonImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const ClosedPolygonalImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const OpenPolygonalImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const BezierImp* imp) Q_DECL_OVERRIDE;
-  void visit( const RationalBezierImp* imp) Q_DECL_OVERRIDE;
+  void visit( const LineImp* imp ) override;
+  void visit( const PointImp* imp ) override;
+  void visit( const TextImp* imp ) override;
+  void visit( const AngleImp* imp ) override;
+  void visit( const VectorImp* imp ) override;
+  void visit( const LocusImp* imp ) override;
+  void visit( const CircleImp* imp ) override;
+  void visit( const ConicImp* imp ) override;
+  void visit( const CubicImp* imp ) override;
+  void visit( const SegmentImp* imp ) override;
+  void visit( const RayImp* imp ) override;
+  void visit( const ArcImp* imp ) override;
+  void visit( const FilledPolygonImp* imp ) override;
+  void visit( const ClosedPolygonalImp* imp ) override;
+  void visit( const OpenPolygonalImp* imp ) override;
+  void visit( const BezierImp* imp) override;
+  void visit( const RationalBezierImp* imp) override;
 
   double unit;
 

filters/svgexporter.h

@@ -19,10 +19,10 @@ class SVGExporter
 {
 public:
   ~SVGExporter();
-  QString exportToStatement() const Q_DECL_OVERRIDE;
-  QString menuEntryName() const Q_DECL_OVERRIDE;
-  QString menuIcon() const Q_DECL_OVERRIDE;
-  void run( const KigPart& part, KigWidget& w ) Q_DECL_OVERRIDE;
+  QString exportToStatement() const override;
+  QString menuEntryName() const override;
+  QString menuIcon() const override;
+  void run( const KigPart& part, KigWidget& w ) override;
 };
 
 #endif

filters/xfigexporter.cc

@@ -97,21 +97,21 @@ public:
       mcolormap[Qt::white] = 7;
     }
   using ObjectImpVisitor::visit;
-  void visit( const LineImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const PointImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const TextImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const AngleImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const VectorImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const LocusImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const CircleImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const ConicImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const CubicImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const SegmentImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const RayImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const ArcImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const FilledPolygonImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const ClosedPolygonalImp* imp ) Q_DECL_OVERRIDE;
-  void visit( const OpenPolygonalImp* imp ) Q_DECL_OVERRIDE;
+  void visit( const LineImp* imp ) override;
+  void visit( const PointImp* imp ) override;
+  void visit( const TextImp* imp ) override;
+  void visit( const AngleImp* imp ) override;
+  void visit( const VectorImp* imp ) override;
+  void visit( const LocusImp* imp ) override;
+  void visit( const CircleImp* imp ) override;
+  void visit( const ConicImp* imp ) override;
+  void visit( const CubicImp* imp ) override;
+  void visit( const SegmentImp* imp ) override;
+  void visit( const RayImp* imp ) override;
+  void visit( const ArcImp* imp ) override;
+  void visit( const FilledPolygonImp* imp ) override;
+  void visit( const ClosedPolygonalImp* imp ) override;
+  void visit( const OpenPolygonalImp* imp ) override;
 };
 
 void XFigExportImpVisitor::mapColor( const ObjectDrawer* obj )

filters/xfigexporter.h

@@ -17,9 +17,9 @@ class XFigExporter
 {
 public:
   ~XFigExporter();
-  QString exportToStatement() const Q_DECL_OVERRIDE;
-  QString menuEntryName() const Q_DECL_OVERRIDE;
-  QString menuIcon() const Q_DECL_OVERRIDE;
-  void run( const KigPart& doc, KigWidget& w ) Q_DECL_OVERRIDE;
+  QString exportToStatement() const override;
+  QString menuEntryName() const override;
+  QString menuIcon() const override;
+  void run( const KigPart& doc, KigWidget& w ) override;
 };
 #endif

geogebra/geogebratransformer.h

@@ -41,18 +41,18 @@ public:
     const GeogebraSection & getSection( size_t sectionIdx ) const { return m_sections[sectionIdx]; };
 
     // QAbstractXmlReceiver implementation
-    void atomicValue ( const QVariant & ) Q_DECL_OVERRIDE;
-    void attribute ( const QXmlName & name, const QStringRef & value ) Q_DECL_OVERRIDE;
-    void characters ( const QStringRef & ) Q_DECL_OVERRIDE;
-    void comment ( const QString & ) Q_DECL_OVERRIDE;
-    void endDocument() Q_DECL_OVERRIDE;
-    void endElement() Q_DECL_OVERRIDE;
-    void endOfSequence() Q_DECL_OVERRIDE;
-    void namespaceBinding ( const QXmlName & ) Q_DECL_OVERRIDE;
-    void processingInstruction ( const QXmlName &, const QString & ) Q_DECL_OVERRIDE;
-    void startDocument() Q_DECL_OVERRIDE;
-    void startElement ( const QXmlName & name ) Q_DECL_OVERRIDE;
-    void startOfSequence() Q_DECL_OVERRIDE;
+    void atomicValue ( const QVariant & ) override;
+    void attribute ( const QXmlName & name, const QStringRef & value ) override;
+    void characters ( const QStringRef & ) override;
+    void comment ( const QString & ) override;
+    void endDocument() override;
+    void endElement() override;
+    void endOfSequence() override;
+    void namespaceBinding ( const QXmlName & ) override;
+    void processingInstruction ( const QXmlName &, const QString & ) override;
+    void startDocument() override;
+    void startElement ( const QXmlName & name ) override;
+    void startOfSequence() override;
 
 private:
     void resetDrawerVars()

kig/kig.h

@@ -50,34 +50,34 @@ class Kig : public KParts::MainWindow
    *
    * \param e
    */
-  void dragEnterEvent( QDragEnterEvent* e ) Q_DECL_OVERRIDE;
+  void dragEnterEvent( QDragEnterEvent* e ) override;
 
   /**
    * The user dropped something onto us...
    *
    * \param e
    */
-  void dropEvent( QDropEvent* e ) Q_DECL_OVERRIDE;
+  void dropEvent( QDropEvent* e ) override;
 
   /**
    * this is called by the framework before closing the window, to
    * allow the user to save his changes... returning false cancels the
    * close request...
    */
-  bool queryClose() Q_DECL_OVERRIDE;
+  bool queryClose() override;
 
   /**
    * This method is called when it is time for the app to save its
    * properties for session management purposes.
    */
-  void saveProperties(KConfigGroup &) Q_DECL_OVERRIDE;
+  void saveProperties(KConfigGroup &) override;
 
   /**
    * This method is called when this app is restored.  The KConfig
    * object points to the session management config file that was saved
    * with \ref saveProperties
    */
-  void readProperties(const KConfigGroup &) Q_DECL_OVERRIDE;
+  void readProperties(const KConfigGroup &) override;
 
  private slots:
   void fileNew();

kig/kig_commands.h

@@ -65,8 +65,8 @@ public:
 
   void addTask( KigCommandTask* );
 
-  void redo() Q_DECL_OVERRIDE;
-  void undo() Q_DECL_OVERRIDE;
+  void redo() override;
+  void undo() override;
 private:
   Q_DISABLE_COPY( KigCommand )
 };
@@ -90,8 +90,8 @@ class AddObjectsTask
 public:
   explicit AddObjectsTask( const std::vector<ObjectHolder*>& os);
   ~AddObjectsTask ();
-  void execute( KigPart& doc ) Q_DECL_OVERRIDE;
-  void unexecute( KigPart& doc ) Q_DECL_OVERRIDE;
+  void execute( KigPart& doc ) override;
+  void unexecute( KigPart& doc ) override;
 protected:
   bool undone;
 
@@ -103,8 +103,8 @@ class RemoveObjectsTask
 {
 public:
   explicit RemoveObjectsTask( const std::vector<ObjectHolder*>& os );
-  void execute( KigPart& ) Q_DECL_OVERRIDE;
-  void unexecute( KigPart& ) Q_DECL_OVERRIDE;
+  void execute( KigPart& ) override;
+  void unexecute( KigPart& ) override;
 };
 
 class ChangeObjectConstCalcerTask
@@ -114,8 +114,8 @@ public:
   ChangeObjectConstCalcerTask( ObjectConstCalcer* calcer, ObjectImp* newimp );
   ~ChangeObjectConstCalcerTask();
 
-  void execute( KigPart& ) Q_DECL_OVERRIDE;
-  void unexecute( KigPart& ) Q_DECL_OVERRIDE;
+  void execute( KigPart& ) override;
+  void unexecute( KigPart& ) override;
 protected:
   ObjectConstCalcer::shared_ptr mcalcer;
   ObjectImp* mnewimp;
@@ -175,8 +175,8 @@ public:
   explicit ChangeCoordSystemTask( CoordinateSystem* s );
   ~ChangeCoordSystemTask();
 
-  void execute( KigPart& doc ) Q_DECL_OVERRIDE;
-  void unexecute( KigPart& doc ) Q_DECL_OVERRIDE;
+  void execute( KigPart& doc ) override;
+  void unexecute( KigPart& doc ) override;
 };
 
 class ChangeParentsAndTypeTask
@@ -189,8 +189,8 @@ public:
                             const ObjectType* newtype );
   ~ChangeParentsAndTypeTask();
 
-  void execute( KigPart& doc ) Q_DECL_OVERRIDE;
-  void unexecute( KigPart& doc ) Q_DECL_OVERRIDE;
+  void execute( KigPart& doc ) override;
+  void unexecute( KigPart& doc ) override;
 };
 
 class KigViewShownRectChangeTask
@@ -202,8 +202,8 @@ public:
   KigViewShownRectChangeTask( KigWidget& v, const Rect& newrect );
   ~KigViewShownRectChangeTask();
 
-  void execute( KigPart& doc ) Q_DECL_OVERRIDE;
-  void unexecute( KigPart& doc ) Q_DECL_OVERRIDE;
+  void execute( KigPart& doc ) override;
+  void unexecute( KigPart& doc ) override;
 };
 
 class ChangeObjectDrawerTask
@@ -215,8 +215,8 @@ public:
   ChangeObjectDrawerTask( ObjectHolder* holder, ObjectDrawer* newdrawer );
   ~ChangeObjectDrawerTask();
 
-  void execute( KigPart& doc ) Q_DECL_OVERRIDE;
-  void unexecute( KigPart& doc ) Q_DECL_OVERRIDE;
+  void execute( KigPart& doc ) override;
+  void unexecute( KigPart& doc ) override;
 };
 
 #endif

kig/kig_part.h

@@ -72,19 +72,19 @@ protected:
   /**
    * load our internal document from m_file
    */
-  bool openFile() Q_DECL_OVERRIDE;
+  bool openFile() override;
 
   /**
    * save our internal document to m_file
    */
-  bool saveFile() Q_DECL_OVERRIDE;
+  bool saveFile() override;
 
   /**
    * KigPart cannot be safely destroyed if it's in a nested event loop
    * (construct mode). As a workaround, call this first so it can cancel the
    * construction.
    */
-  bool queryClose() Q_DECL_OVERRIDE;
+  bool queryClose() override;
 
 public:
   void emitStatusBarText( const QString& text );