mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

german/tipp10: Finish C++ fixes for gcc48

Browse Source 
These patches should have been included in previous commit.
Fixes gcc48/binutils 2.23 failures
This commit is contained in:
John Marino 2013-10-30 15:53:09 +00:00
parent b7bcca829c
commit 27d5292290
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=332135
4 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
german/tipp10/files/patch-sql_chartablesql.cpp Normal file
View File

@ -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)

11
german/tipp10/files/patch-sql_startsql.cpp Normal file
View File

@ -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,'" +

20
german/tipp10/files/patch-widget_lessondialog.cpp Normal file
View File

@ -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);
}
}

11
german/tipp10/files/patch-widget_settingspages.cpp Normal file
View File

@ -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();
}