From owner-svn-ports-all@FreeBSD.ORG Wed Oct 30 15:53:10 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6F5A6625; Wed, 30 Oct 2013 15:53:10 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C8BA2C5D; Wed, 30 Oct 2013 15:53:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UFrAnb039525; Wed, 30 Oct 2013 15:53:10 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UFr93I039520; Wed, 30 Oct 2013 15:53:09 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201310301553.r9UFr93I039520@svn.freebsd.org> From: John Marino Date: Wed, 30 Oct 2013 15:53:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332135 - head/german/tipp10/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 15:53:10 -0000 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(); + } +