Add override and noexcept modifiers

- uses global includes where needed

Author: mrbean-bremen

.idea/.gitignore

@@ -642,7 +642,7 @@ class PYTHONQT_EXPORT PythonQt : public QObject {
   PythonQtSignalReceiver* getSignalReceiver(QObject* obj);
 
   PythonQt(int flags, const QByteArray& pythonQtModuleName);
-  ~PythonQt();
+  ~PythonQt() override;
   static PythonQt* _self;
   static int _uniqueModuleCount;
 
@@ -659,7 +659,7 @@ class PYTHONQT_EXPORT PythonQtPrivate : public QObject {
 
 public:
   PythonQtPrivate();
-  ~PythonQtPrivate();
+  ~PythonQtPrivate() override;
 
   enum DecoratorTypes {
     StaticDecorator = 1,

src/PythonQt.h

@@ -44,11 +44,11 @@
 
 #include "PythonQtPythonInclude.h"
 
-#include "structmember.h"
-#include "osdefs.h"
-#include "marshal.h"
 #include "compile.h"
-#include <time.h>
+#include "marshal.h"
+#include "osdefs.h"
+#include "structmember.h"
+#include <ctime>
 
 #include <qobject.h>
 #include <qstring.h>

src/PythonQtImporter.h

@@ -39,8 +39,8 @@
 */
 //----------------------------------------------------------------------------------
 
+#include <PythonQt.h>
 
-#include "PythonQt.h"
 QVariant PythonQtObjectPtr::evalScript(const QString& script, int start)
 {
   return PythonQt::self()->evalScript(_object, script, start);

src/PythonQtObjectPtr.cpp

@@ -64,7 +64,7 @@ class PYTHONQT_EXPORT PythonQtObjectPtr
   }
 
   //! rvalue copy constructor, does not need any incref/decref.
-  PythonQtObjectPtr(PythonQtObjectPtr &&p)
+  PythonQtObjectPtr(PythonQtObjectPtr &&p) noexcept
     :_object(p.takeObject()) {
   }
 
@@ -95,7 +95,7 @@ class PYTHONQT_EXPORT PythonQtObjectPtr
   }
 
   //! rvalue assignment operator that steals the reference from p
-  PythonQtObjectPtr &operator=(PythonQtObjectPtr &&p) {
+  PythonQtObjectPtr &operator=(PythonQtObjectPtr &&p) noexcept {
     if (_object) {
       setObject(nullptr);
     }
@@ -210,7 +210,7 @@ class PYTHONQT_EXPORT PythonQtSafeObjectPtr
   }
 
   //! rvalue copy constructor, does not need any incref/decref.
-  PythonQtSafeObjectPtr(PythonQtSafeObjectPtr &&p)
+  PythonQtSafeObjectPtr(PythonQtSafeObjectPtr &&p) noexcept
     :_object(p._object) {
     p._object = nullptr;
   }
@@ -235,7 +235,7 @@ class PYTHONQT_EXPORT PythonQtSafeObjectPtr
   }
 
   //! rvalue assignment operator that steals the reference from p
-  PythonQtSafeObjectPtr &operator=(PythonQtSafeObjectPtr &&p) {
+  PythonQtSafeObjectPtr &operator=(PythonQtSafeObjectPtr &&p) noexcept {
     if (_object) {
       setObject(nullptr);
     }

src/PythonQtObjectPtr.h

@@ -49,16 +49,16 @@
 class PythonQtQFileImporter : public PythonQtImportFileInterface {
 public:
     PythonQtQFileImporter();
-    ~PythonQtQFileImporter();
+    ~PythonQtQFileImporter() override;
 
-    QByteArray readFileAsBytes (const QString &filename);
-    
-    QByteArray readSourceFile (const QString &filename, bool &ok);
-    
-    bool exists (const QString &filename);
-    bool isEggArchive(const QString& filename);
-    
-    QDateTime lastModifiedDate (const QString &filename);
+    QByteArray readFileAsBytes (const QString &filename) override;
+
+    QByteArray readSourceFile (const QString &filename, bool &ok) override;
+
+    bool exists (const QString &filename) override;
+    bool isEggArchive(const QString& filename) override;
+
+    QDateTime lastModifiedDate (const QString &filename) override;
 
 };
 

src/PythonQtQFileImporter.h

@@ -113,7 +113,7 @@ class PythonQtSignalReceiver : public PythonQtSignalReceiverBase {
 
 public:
   PythonQtSignalReceiver(QObject* obj);
-  ~PythonQtSignalReceiver();
+  ~PythonQtSignalReceiver() override;
 
   //! add a signal handler
   bool addSignalHandler(const char* signal, PyObject* callable);
@@ -122,7 +122,7 @@ class PythonQtSignalReceiver : public PythonQtSignalReceiverBase {
   bool removeSignalHandler(const char* signal, PyObject* callable = nullptr);
 
   //! we implement this method to simulate a number of slots that match the ids in _targets
-  virtual int qt_metacall(QMetaObject::Call c, int id, void **arguments);
+  int qt_metacall(QMetaObject::Call c, int id, void **arguments) override;
 
 private:
   //! get the index of the signal

src/PythonQtSignalReceiver.h

@@ -57,14 +57,14 @@ class PYTHONQT_EXPORT PythonQtScriptingConsole : public QTextEdit
 public:
   PythonQtScriptingConsole(QWidget* parent, const PythonQtObjectPtr& context, Qt::WindowFlags i = 0);
 
-  ~PythonQtScriptingConsole();
+  ~PythonQtScriptingConsole() override;
 
 public Q_SLOTS:
   //! execute current line
   void executeLine(bool storeOnly);
 
   //! derived key press event
-  void keyPressEvent (QKeyEvent * e);
+  void keyPressEvent (QKeyEvent * e) override;
 
   //! output from console
   void consoleMessage(const QString & message);