File tipp10-fpermissive.patch of Package tipp10
Index: tipp10_source_v2-1-0/widget/tickerboard.cpp
===================================================================
--- tipp10_source_v2-1-0.orig/widget/tickerboard.cpp
+++ tipp10_source_v2-1-0/widget/tickerboard.cpp
@@ -97,7 +97,7 @@ void TickerBoard::startTicker(bool wasPa
if (tickerSpeed == 50) {
scrollOffset = 290;
- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
+ scroll(-290, 0, QRect(10, 15, 590, 35)); //contentsRect());
}
startFlag = true;
@@ -153,7 +153,7 @@ void TickerBoard::changeChar() {
scrollOffset = 0;
} else {
scrollOffset = 290;
- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
+ scroll(-290, 0, QRect(10, 15, 590, 35)); //contentsRect());
}
splitLesson();
}
@@ -242,7 +242,7 @@ void TickerBoard::progress() {
// Move ticker 1 pixel to left
scrollOffset++;
- scroll(-1, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
+ scroll(-1, 0, QRect(10, 15, 590, 35)); //contentsRect());
if ((lessonOffset - scrollOffset) <= 30) {
setSpeed(tickerSpeed);
@@ -265,14 +265,14 @@ void TickerBoard::progress() {
// 160 pixels overage (because the user must see at least the next word)
if ((lessonOffset - scrollOffset) > 200) {
scrollOffset += (lessonOffset - scrollOffset) - 200;
- scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
+ scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect(10, 15, 590, 35)); //contentsRect());
}
} else {
// If the user types faster than the ticker, move ticker faster after
// 160 pixels overage (because the user must see at least the next word)
if ((lessonOffset - scrollOffset) > 280) {
scrollOffset += 570;
- scroll(-570, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
+ scroll(-570, 0, QRect(10, 15, 590, 35)); //contentsRect());
}
}
Index: tipp10_source_v2-1-0/widget/settingspages.cpp
===================================================================
--- tipp10_source_v2-1-0.orig/widget/settingspages.cpp
+++ tipp10_source_v2-1-0/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();
}
Index: tipp10_source_v2-1-0/widget/lessondialog.cpp
===================================================================
--- tipp10_source_v2-1-0.orig/widget/lessondialog.cpp
+++ tipp10_source_v2-1-0/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);
}
}
Index: tipp10_source_v2-1-0/sql/chartablesql.cpp
===================================================================
--- tipp10_source_v2-1-0.orig/sql/chartablesql.cpp
+++ tipp10_source_v2-1-0/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(QChar(unicode)) + "\'";
return unicodeToChar;
} else {
// Last column (error weight)
Index: tipp10_source_v2-1-0/sql/startsql.cpp
===================================================================
--- tipp10_source_v2-1-0.orig/sql/startsql.cpp
+++ tipp10_source_v2-1-0/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,'" +