svn commit: r332135 - head/german/tipp10/files

[John Marino]

Author: marino
Date: Wed Oct 30 15:53:09 2013
New Revision: 332135
URL: http://svnweb.freebsd.org/changeset/ports/332135

Log:
  german/tipp10: Finish C++ fixes for gcc48
  
  These patches should have been included in previous commit.
  Fixes gcc48/binutils 2.23 failures

Added:
  head/german/tipp10/files/patch-sql_chartablesql.cpp   (contents, props changed)
  head/german/tipp10/files/patch-sql_startsql.cpp   (contents, props changed)
  head/german/tipp10/files/patch-widget_lessondialog.cpp   (contents, props changed)
  head/german/tipp10/files/patch-widget_settingspages.cpp   (contents, props changed)

Added: head/german/tipp10/files/patch-sql_chartablesql.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/german/tipp10/files/patch-sql_chartablesql.cpp	Wed Oct 30 15:53:09 2013	(r332135)
@@ -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)

Added: head/german/tipp10/files/patch-sql_startsql.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/german/tipp10/files/patch-sql_startsql.cpp	Wed Oct 30 15:53:09 2013	(r332135)
@@ -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,'" +

Added: head/german/tipp10/files/patch-widget_lessondialog.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/german/tipp10/files/patch-widget_lessondialog.cpp	Wed Oct 30 15:53:09 2013	(r332135)
@@ -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);
+ 		}
+ 	}

Added: head/german/tipp10/files/patch-widget_settingspages.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/german/tipp10/files/patch-widget_settingspages.cpp	Wed Oct 30 15:53:09 2013	(r332135)
@@ -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();
+ }
+