From 27d52922908ab91e8549439dd237581643046be4 Mon Sep 17 00:00:00 2001
From: John Marino <marino@FreeBSD.org>
Date: Wed, 30 Oct 2013 15:53:09 +0000
Subject: [PATCH] german/tipp10: Finish C++ fixes for gcc48

These patches should have been included in previous commit.
Fixes gcc48/binutils 2.23 failures
---
 .../tipp10/files/patch-sql_chartablesql.cpp   | 11 ++++++++++
 german/tipp10/files/patch-sql_startsql.cpp    | 11 ++++++++++
 .../files/patch-widget_lessondialog.cpp       | 20 +++++++++++++++++++
 .../files/patch-widget_settingspages.cpp      | 11 ++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 german/tipp10/files/patch-sql_chartablesql.cpp
 create mode 100644 german/tipp10/files/patch-sql_startsql.cpp
 create mode 100644 german/tipp10/files/patch-widget_lessondialog.cpp
 create mode 100644 german/tipp10/files/patch-widget_settingspages.cpp

diff --git a/german/tipp10/files/patch-sql_chartablesql.cpp b/german/tipp10/files/patch-sql_chartablesql.cpp
new file mode 100644
index 000000000000..956931c21aa4
--- /dev/null
+++ b/german/tipp10/files/patch-sql_chartablesql.cpp
@@ -0,0 +1,11 @@
+--- sql/chartablesql.cpp.orig	2013-10-30 15:20:29.130118000 +0000
++++ sql/chartablesql.cpp
+@@ -57,7 +57,7 @@ QVariant CharSqlModel::data(const QModel
+ 			// Read the unicode value
+ 			unicode = value.toInt();
+ 			// Convert unicode to a char
+-			unicodeToChar = QString::QString(QChar(unicode)); //"\'" + QString::QString(QChar(unicode)) + "\'";
++			unicodeToChar = QString(QChar(unicode)); //"\'" + QString::QString(QChar(unicode)) + "\'";
+ 			return unicodeToChar;
+ 		} else {
+ 			// Last column (error weight)
diff --git a/german/tipp10/files/patch-sql_startsql.cpp b/german/tipp10/files/patch-sql_startsql.cpp
new file mode 100644
index 000000000000..81efa7a2ab49
--- /dev/null
+++ b/german/tipp10/files/patch-sql_startsql.cpp
@@ -0,0 +1,11 @@
+--- sql/startsql.cpp.orig	2013-10-30 15:20:29.130118000 +0000
++++ sql/startsql.cpp
+@@ -344,7 +344,7 @@ bool StartSql::updateOwnLesson(QString l
+ 		for (i = 0; i < content.size(); i++) {
+ 			//simplifiedContent = QString::QString(
+ 			//	content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive).simplified();
+-			simplifiedContent = trim(QString::QString(
++			simplifiedContent = trim(QString(
+ 				content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive));
+ 
+ 			if (!query.exec("INSERT INTO own_content VALUES(NULL,'" +
diff --git a/german/tipp10/files/patch-widget_lessondialog.cpp b/german/tipp10/files/patch-widget_lessondialog.cpp
new file mode 100644
index 000000000000..671285d13057
--- /dev/null
+++ b/german/tipp10/files/patch-widget_lessondialog.cpp
@@ -0,0 +1,20 @@
+--- widget/lessondialog.cpp.orig	2013-10-30 15:20:29.110117000 +0000
++++ widget/lessondialog.cpp
+@@ -89,7 +89,7 @@ void LessonDialog::updateContent() {
+ 			*lessonData = lineLessonContent->toPlainText().split("\n", QString::SkipEmptyParts);
+ 			// Delete empty lines
+ 			for (int i = 0; i < lessonData->size(); i++) {
+-				if (QString::QString(lessonData->at(i).toLocal8Bit().constData()).simplified() == "") {
++				if (QString(lessonData->at(i).toLocal8Bit().constData()).simplified() == "") {
+ 					lessonData->removeAt(i);
+ 				}
+ 			}
+@@ -259,7 +259,7 @@ void LessonDialog::clickSave() {
+ 	contentList = lineLessonContent->toPlainText().split("\n", QString::SkipEmptyParts);
+ 	// Delete empty lines
+ 	for (i = 0; i < contentList.size(); i++) {
+-		if (QString::QString(contentList.at(i).toLocal8Bit().constData()).simplified() == "") {
++		if (QString(contentList.at(i).toLocal8Bit().constData()).simplified() == "") {
+ 			contentList.removeAt(i);
+ 		}
+ 	}
diff --git a/german/tipp10/files/patch-widget_settingspages.cpp b/german/tipp10/files/patch-widget_settingspages.cpp
new file mode 100644
index 000000000000..b4e2405f1590
--- /dev/null
+++ b/german/tipp10/files/patch-widget_settingspages.cpp
@@ -0,0 +1,11 @@
+--- widget/settingspages.cpp.orig	2013-10-30 15:20:29.120118000 +0000
++++ widget/settingspages.cpp
+@@ -501,7 +501,7 @@ void DatabasePage::writeSettings() {
+ 	QSettings settings;
+ 	#endif
+ 	settings.beginGroup("database");
+-	settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString::QString(APP_USER_DB));
++	settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString(APP_USER_DB));
+ 	settings.endGroup();
+ }
+