Refactor: Translation function for Database

For #168

Author: svetter

src/db/database.cpp

@@ -25,6 +25,7 @@
 
 #include "src/db/db_error.h"
 
+#include <QCoreApplication>
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QFile>
@@ -114,8 +115,9 @@ void Database::createNew(QWidget* parent, const QString& filepath)
 	sql.setDatabaseName(filepath);
 
 	// Open connection
-	if (!sql.open())
+	if (!sql.open()) {
 		displayError(parent, sql.lastError());
+	}
 	databaseLoaded = true;
 
 	qDebug() << "Creating tables in SQL";
@@ -143,8 +145,9 @@ void Database::openExisting(QWidget* parent, const QString& filepath)
 	sql.setDatabaseName(filepath);
 
 	// Open connection
-	if (!sql.open())
+	if (!sql.open()) {
 		displayError(parent, sql.lastError());
+	}
 	databaseLoaded = true;
 
 	populateBuffers(parent);
@@ -224,6 +227,13 @@ void Database::populateBuffers(QWidget* parent)
 
 
 
+QString Database::tr(const QString& string)
+{
+	return QCoreApplication::translate("Database", string.toStdString().c_str());
+}
+
+
+
 /**
  * Returns a list of all tables in the database (not including the project settings table).
  * 

src/db/database.h

@@ -123,6 +123,9 @@ class Database {
 	QList<WhatIfDeleteResult> removeRow_referenceSearch(QWidget* parent, bool searchNotExecute, NormalTable* table, ValidItemID primaryKey);
 
 	void populateBuffers(QWidget* parent);
+	
+public:
+	static QString tr(const QString& string);
 };
 
 

src/db/db_error.cpp

@@ -23,7 +23,7 @@
 
 #include "db_error.h"
 
-#include <QApplication>
+#include "database.h"
 
 #include <QMessageBox>
 
@@ -37,7 +37,7 @@
  */
 void displayError(QWidget* parent, QString error)
 {
-	QMessageBox::critical(parent, QCoreApplication::translate("Database", "Database error"), error);
+	QMessageBox::critical(parent, Database::tr("Database error"), error);
 	exit(1);
 }
 
@@ -51,7 +51,7 @@ QString formatSqlError(QSqlError error)
 {
 	QString driverError		= error.driverText();	// Translated
 	QString databaseError	= error.databaseText();	// Untranslated
-	return driverError + ".\n\n" + QCoreApplication::translate("Database", "Details:") + " \"" + databaseError + "\"";
+	return driverError + ".\n\n" + Database::tr("Details:") + " \"" + databaseError + "\"";
 }
 
 
@@ -65,7 +65,7 @@ QString formatSqlError(QSqlError error)
  */
 void displayError(QWidget* parent, QString error, QString& queryString)
 {
-	return displayError(parent, error + "\n\n" + QCoreApplication::translate("Database", "Query:") + "\n" + queryString);
+	return displayError(parent, error + "\n\n" + Database::tr("Query:") + "\n" + queryString);
 }
 
 /**