[glom] C++11: ConnectionPool Backends: Use the override keyword.



commit d2457afa8e0195fcb51f063b95e62bdb13b0c873
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 26 22:30:05 2015 +0100

    C++11: ConnectionPool Backends: Use the override keyword.

 glom/libglom/connectionpool_backends/mysql.h       |   12 ++++++------
 .../connectionpool_backends/mysql_central.h        |    4 ++--
 glom/libglom/connectionpool_backends/mysql_self.h  |   12 ++++++------
 glom/libglom/connectionpool_backends/postgres.h    |   12 ++++++------
 .../connectionpool_backends/postgres_central.h     |    4 ++--
 .../connectionpool_backends/postgres_self.h        |   12 ++++++------
 glom/libglom/connectionpool_backends/sqlite.h      |   20 ++++++++++----------
 7 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/glom/libglom/connectionpool_backends/mysql.h b/glom/libglom/connectionpool_backends/mysql.h
index c86b3d1..d2956fb 100644
--- a/glom/libglom/connectionpool_backends/mysql.h
+++ b/glom/libglom/connectionpool_backends/mysql.h
@@ -47,9 +47,9 @@ public:
 
   /** Save a backup file, using the same directory layout as used by self-hosting.
    */
-  virtual bool save_backup(const SlotProgress& slot_progress, const Glib::ustring& username, const 
Glib::ustring& password, const Glib::ustring& database_name);
+  bool save_backup(const SlotProgress& slot_progress, const Glib::ustring& username, const Glib::ustring& 
password, const Glib::ustring& database_name) override;
 
-  virtual bool convert_backup(const SlotProgress& slot_progress, const std::string& backup_data_file_path, 
const Glib::ustring& username, const Glib::ustring& password, const Glib::ustring& database_name);
+  bool convert_backup(const SlotProgress& slot_progress, const std::string& backup_data_file_path, const 
Glib::ustring& username, const Glib::ustring& password, const Glib::ustring& database_name) override;
 
   /** Return the quoted path to the specified PostgreSQL utility.
    */
@@ -58,11 +58,11 @@ public:
 
 
 private:
-  virtual bool supports_remote_access() const;
-  virtual Gnome::Gda::SqlOperatorType get_string_find_operator() const;
-  virtual const char* get_public_schema_name() const;
+  bool supports_remote_access() const override;
+  Gnome::Gda::SqlOperatorType get_string_find_operator() const override;
+  const char* get_public_schema_name() const override;
 
-  virtual bool change_columns(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& 
table_name, const type_vec_const_fields& old_fields, const type_vec_const_fields& new_fields) noexcept;
+  bool change_columns(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& 
table_name, const type_vec_const_fields& old_fields, const type_vec_const_fields& new_fields) noexcept 
override;
 
 protected:
   bool attempt_create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& host, const Glib::ustring& port, const Glib::ustring& username, const Glib::ustring& password);
diff --git a/glom/libglom/connectionpool_backends/mysql_central.h 
b/glom/libglom/connectionpool_backends/mysql_central.h
index 8bdbbfb..d2b0eea 100644
--- a/glom/libglom/connectionpool_backends/mysql_central.h
+++ b/glom/libglom/connectionpool_backends/mysql_central.h
@@ -48,9 +48,9 @@ public:
   bool get_try_other_ports() const;
 
 private:
-  virtual Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& 
username, const Glib::ustring& password, bool fake_connection = false);
+  Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& username, 
const Glib::ustring& password, bool fake_connection = false) override;
 
-  virtual bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password);
+  bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password) override;
 
 private:
   typedef std::vector<Glib::ustring> type_list_ports;
diff --git a/glom/libglom/connectionpool_backends/mysql_self.h 
b/glom/libglom/connectionpool_backends/mysql_self.h
index f0d2241..66af37c 100644
--- a/glom/libglom/connectionpool_backends/mysql_self.h
+++ b/glom/libglom/connectionpool_backends/mysql_self.h
@@ -57,15 +57,15 @@ public:
 private:
   std::string get_mysqladmin_command(const Glib::ustring& username, const Glib::ustring& password);
 
-  virtual InitErrors initialize(const SlotProgress& slot_progress, const Glib::ustring& initial_username, 
const Glib::ustring& password, bool network_shared = false);
+  InitErrors initialize(const SlotProgress& slot_progress, const Glib::ustring& initial_username, const 
Glib::ustring& password, bool network_shared = false) override;
 
-  virtual StartupErrors startup(const SlotProgress& slot_progress, bool network_shared = false);
-  virtual bool cleanup(const SlotProgress& slot_progress);
-  virtual bool set_network_shared(const SlotProgress& slot_progress, bool network_shared = true);
+  StartupErrors startup(const SlotProgress& slot_progress, bool network_shared = false) override;
+  bool cleanup(const SlotProgress& slot_progress) override;
+  bool set_network_shared(const SlotProgress& slot_progress, bool network_shared = true) override;
 
-  virtual Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& 
username, const Glib::ustring& password, bool fake_connection = false);
+  Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& username, 
const Glib::ustring& password, bool fake_connection = false) override;
 
-  virtual bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password);
+  bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password) override;
 
 private:
   /** Examine ports one by one, starting at @a starting_port, in increasing
diff --git a/glom/libglom/connectionpool_backends/postgres.h b/glom/libglom/connectionpool_backends/postgres.h
index 79f3ce6..130ab2e 100644
--- a/glom/libglom/connectionpool_backends/postgres.h
+++ b/glom/libglom/connectionpool_backends/postgres.h
@@ -47,9 +47,9 @@ public:
 
   /** Save a backup file, using the same directory layout as used by self-hosting.
    */
-  virtual bool save_backup(const SlotProgress& slot_progress, const Glib::ustring& username, const 
Glib::ustring& password, const Glib::ustring& database_name);
+  bool save_backup(const SlotProgress& slot_progress, const Glib::ustring& username, const Glib::ustring& 
password, const Glib::ustring& database_name) override;
 
-  virtual bool convert_backup(const SlotProgress& slot_progress, const std::string& backup_data_file_path, 
const Glib::ustring& username, const Glib::ustring& password, const Glib::ustring& database_name);
+  bool convert_backup(const SlotProgress& slot_progress, const std::string& backup_data_file_path, const 
Glib::ustring& username, const Glib::ustring& password, const Glib::ustring& database_name) override;
 
   /** Return the quoted path to the specified PostgreSQL utility.
    */
@@ -58,11 +58,11 @@ public:
 
 
 private:
-  virtual bool supports_remote_access() const;
-  virtual Gnome::Gda::SqlOperatorType get_string_find_operator() const;
-  virtual const char* get_public_schema_name() const;
+  bool supports_remote_access() const override;
+  Gnome::Gda::SqlOperatorType get_string_find_operator() const override;
+  const char* get_public_schema_name() const override;
 
-  virtual bool change_columns(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& 
table_name, const type_vec_const_fields& old_fields, const type_vec_const_fields& new_fields) noexcept;
+   bool change_columns(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& 
table_name, const type_vec_const_fields& old_fields, const type_vec_const_fields& new_fields) noexcept 
override;
 
 protected:
   bool attempt_create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& host, const Glib::ustring& port, const Glib::ustring& username, const Glib::ustring& password);
diff --git a/glom/libglom/connectionpool_backends/postgres_central.h 
b/glom/libglom/connectionpool_backends/postgres_central.h
index 4d76f14..8631cbd 100644
--- a/glom/libglom/connectionpool_backends/postgres_central.h
+++ b/glom/libglom/connectionpool_backends/postgres_central.h
@@ -48,9 +48,9 @@ public:
   bool get_try_other_ports() const;
 
 private:
-  virtual Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& 
username, const Glib::ustring& password, bool fake_connection = false);
+  Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& username, 
const Glib::ustring& password, bool fake_connection = false) override;
 
-  virtual bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password);
+  bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password) override;
 
 private:
   typedef std::vector<Glib::ustring> type_list_ports;
diff --git a/glom/libglom/connectionpool_backends/postgres_self.h 
b/glom/libglom/connectionpool_backends/postgres_self.h
index 4c18945..38d0df9 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.h
+++ b/glom/libglom/connectionpool_backends/postgres_self.h
@@ -55,15 +55,15 @@ public:
   static bool install_postgres(const SlotProgress& slot_progress);
 
 private:
-  virtual InitErrors initialize(const SlotProgress& slot_progress, const Glib::ustring& initial_username, 
const Glib::ustring& password, bool network_shared = false);
+  InitErrors initialize(const SlotProgress& slot_progress, const Glib::ustring& initial_username, const 
Glib::ustring& password, bool network_shared = false) override;
 
-  virtual StartupErrors startup(const SlotProgress& slot_progress, bool network_shared = false);
-  virtual bool cleanup(const SlotProgress& slot_progress);
-  virtual bool set_network_shared(const SlotProgress& slot_progress, bool network_shared = true);
+  StartupErrors startup(const SlotProgress& slot_progress, bool network_shared = false) override;
+  bool cleanup(const SlotProgress& slot_progress) override;
+  bool set_network_shared(const SlotProgress& slot_progress, bool network_shared = true) override;
 
-  virtual Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& 
username, const Glib::ustring& password, bool fake_connection = false);
+  Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& username, 
const Glib::ustring& password, bool fake_connection = false) override;
 
-  virtual bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password);
+  bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password) override;
 
 private:
   /** Examine ports one by one, starting at @a starting_port, in increasing
diff --git a/glom/libglom/connectionpool_backends/sqlite.h b/glom/libglom/connectionpool_backends/sqlite.h
index 9c2071c..430ab65 100644
--- a/glom/libglom/connectionpool_backends/sqlite.h
+++ b/glom/libglom/connectionpool_backends/sqlite.h
@@ -38,9 +38,9 @@ public:
   Sqlite();
 
 private:
-  virtual bool supports_remote_access() const;
-  virtual Gnome::Gda::SqlOperatorType get_string_find_operator() const;
-  virtual const char* get_public_schema_name() const;
+  bool supports_remote_access() const override;
+  Gnome::Gda::SqlOperatorType get_string_find_operator() const override;
+  const char* get_public_schema_name() const override;
 
   bool add_column_to_server_operation(const Glib::RefPtr<Gnome::Gda::ServerOperation>& operation, 
GdaMetaTableColumn* column, unsigned int i);
   bool add_column_to_server_operation(const Glib::RefPtr<Gnome::Gda::ServerOperation>& operation, const 
std::shared_ptr<const Field>& column, unsigned int i);
@@ -51,18 +51,18 @@ private:
 
   bool recreate_table(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& 
table_name, const type_vec_strings& fields_removed, const type_vec_const_fields& fields_added, const 
type_mapFieldChanges& fields_changed) noexcept;
 
-  virtual bool add_column(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& 
table_name, const std::shared_ptr<const Field>& field);
-  virtual bool drop_column(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& 
table_name, const Glib::ustring& field_name);
-  virtual bool change_columns(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& 
table_name, const type_vec_const_fields& old_fields, const type_vec_const_fields& new_fields) noexcept;
+  bool add_column(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& table_name, 
const std::shared_ptr<const Field>& field) override;
+  bool drop_column(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& table_name, 
const Glib::ustring& field_name) override;
+  bool change_columns(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& 
table_name, const type_vec_const_fields& old_fields, const type_vec_const_fields& new_fields) noexcept 
override;
 
-  virtual Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& 
username, const Glib::ustring& password, bool fake_connection = false);
+  Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& username, 
const Glib::ustring& password, bool fake_connection = false) override;
 
   /** Creates a new database.
    */
-  virtual bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password);
+  bool create_database(const SlotProgress& slot_progress, const Glib::ustring& database_name, const 
Glib::ustring& username, const Glib::ustring& password) override;
 
-  virtual bool save_backup(const SlotProgress& slot_progress, const Glib::ustring& username, const 
Glib::ustring& password, const Glib::ustring& database_name);
-  virtual bool convert_backup(const SlotProgress& slot_progress, const std::string& backup_data_file_path, 
const Glib::ustring& username, const Glib::ustring& password, const Glib::ustring& database_name);
+  bool save_backup(const SlotProgress& slot_progress, const Glib::ustring& username, const Glib::ustring& 
password, const Glib::ustring& database_name) override;
+  bool convert_backup(const SlotProgress& slot_progress, const std::string& backup_data_file_path, const 
Glib::ustring& username, const Glib::ustring& password, const Glib::ustring& database_name) override;
 };
 
 } //namespace ConnectionPoolBackends


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]