Hello community, here is the log from the commit of package klettres for openSUSE:Factory checked in at 2016-01-10 13:05:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klettres (Old) and /work/SRC/openSUSE:Factory/.klettres.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "klettres" Changes: -------- --- /work/SRC/openSUSE:Factory/klettres/klettres.changes 2015-11-15 12:36:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.klettres.new/klettres.changes 2016-01-10 13:05:38.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Dec 13 13:21:33 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- klettres-15.08.3.tar.xz New: ---- klettres-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klettres.spec ++++++ --- /var/tmp/diff_new_pack.wqiLXA/_old 2016-01-10 13:05:39.000000000 +0100 +++ /var/tmp/diff_new_pack.wqiLXA/_new 2016-01-10 13:05:39.000000000 +0100 @@ -17,7 +17,7 @@ Name: klettres -Version: 15.08.3 +Version: 15.12.0 Release: 0 Summary: Alphabet Learning Game License: GPL-2.0+ ++++++ klettres-15.08.3.tar.xz -> klettres-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-15.08.3/klettres.appdata.xml new/klettres-15.12.0/klettres.appdata.xml --- old/klettres-15.08.3/klettres.appdata.xml 2015-11-04 19:34:33.000000000 +0100 +++ new/klettres-15.12.0/klettres.appdata.xml 2015-11-04 15:26:40.000000000 +0100 @@ -27,6 +27,7 @@ <name xml:lang="sk">KLettres</name> <name xml:lang="sl">KLettres</name> <name xml:lang="sv">Klettres</name> + <name xml:lang="tr">KLettres</name> <name xml:lang="uk">KLettres</name> <name xml:lang="x-test">xxKLettresxx</name> <name xml:lang="zh-CN">KLettres</name> @@ -54,6 +55,7 @@ <summary xml:lang="sk">Výuka abecedy</summary> <summary xml:lang="sl">Naučite se abecedo</summary> <summary xml:lang="sv">Inlärning av alfabetet</summary> + <summary xml:lang="tr">Alfabeyi Öğrenin</summary> <summary xml:lang="uk">Вивчення абетки</summary> <summary xml:lang="x-test">xxLearn The Alphabetxx</summary> <summary xml:lang="zh-CN">学习字母</summary> @@ -79,6 +81,7 @@ <p xml:lang="sk">KLettres je aplikácia špeciálne určená na pomoc pri výuke abecedy v novom jazyku a potom na naučenie čítania jednoduchých slabík. Používateľ môže byť malé dieťa od 2 a pol roka alebo dospelý, ktorý sa chce naučiť základy cudzieho jazyka. Aktuálne je dostupných 25 jazykov: arabčina, brazílska portugalčina, čeština, dánčina, holandčina, britská angličtina, americká angličtina, fonetická angličtina, francúzština, nemčina, hebrejčina, maďarčina, taliančina, kannadčina, dolná saština, malajalamčina, nórčina Bokmål, pandžábčina, lugandčina, romanizovaná hindčina, ruština, španielčina, slovenčina, telugčina a ukrajinčina. KLettres má špeciálne používateľské prostredie a témy pre mladších používateľov.</p> <p xml:lang="sl">KLettres je program, ki je bil zasnovan tako, da pomaga uporabniku pri učenju abecede njemu neznanega jezika in ga tudi nauči kako prebrati preproste zloge. Uporabnik je lahko otrok starejši od dveh let ali pa odrasli, ki se želi naučiti osnov tujega jezika. Trenutno je na voljo 25 jezikov: arabščina, brazilska portugalščina, češčina, danščina, nizozemščina, britanska angleščina, angleščina ZDA, fonetična angleščina, francoščina, nemščina, hebrejščina, madžarščina, italijanščina, kannadščina, spodnjesaščina, malajalamščina, knjižna norveščina, pandžabščina, jezik Luganda, Romanizirani hindi, ruščina, španščina, slovaščina, teluščina in ukrajinščina. KLettres za mlajše uporabnike ponuja poseben uporabniški vmesnik in teme.</p> <p xml:lang="sv">Klettres är ett program som är särskilt framtaget för att hjälpa användaren att lära sig alfabetet på ett nytt språk och sedan lära sig läsa enkla stavelser. Användaren kan vara ett litet barn från två och ett halvt år, eller en vuxen som vill lära sig grunderna i ett främmande språk. För närvarande är 25 språk är tillgängliga: amerikansk engelska, arabiska, brasiliansk portugisiska, brittisk engelska, danska, franska, hebreiska, holländska, italienska, kanaresiska, luganda, lågsaxiska, malayalam, norskt bokmål, phonics engelska, punjabi, romansk hindi, ryska, slovakiska, spanska, telugu, tjeckiska, tyska, ukrainska och ungerska.</p> + <p xml:lang="tr">KLettres kullanıcıların yeni bir dilin alfabesini ve daha sonra basit heceleri okumayı öğrenmeleri için tasarlanmış bir uygulamadır. Kullanıcı iki buçuk yaşındaki bir çocuktan yeni bir yabancı dilin temellerini öğrenmek isteyen bir yetişkine kadar herkes olabilir. Halen 25 farklı dil desteklenmektedir: Arapça, Brezilya Portekizcesi, Çekçe, Danca, Hollandaca, İngiliz İngilizcesi, Amerikan İngilizcesi, Konuşma İngilizcesi, Fransızca, Almanca, İbranice, Macarca, İtalyanca, Kannada Dili, Aşağı Saksonca, Malayalam Dili, Norveççe, Pencap Dili, Luganda Dili, Şapkalı Hintçe, Rusça, İspanyolca, Slovakça, Telugu Dili ve Ukraynaca. KLettres daha küçük kullanıcılar için özel bir arayüz ve tema sunmaktadır.</p> <p xml:lang="uk">KLettres — це програма, спеціально розроблена для того, щоб допомогти користувачеві вивчити абетку нової мови, а потім навчитися читати прості склади. Користувачем може бути як дитина віком від двох з половиною років, так і доросла людина, яка бажає вивчити основи іноземної мови. У поточній версії ви можете скористатися такими двадцятьма п’ятьма мовами: арабська, бразильська португальська, чеська, данська, голландська, британська англійська, американська англійська, фонетична англійська, французька, німецька, іврит, угорська, італійська, каннада, нижньосаксонська, луганда, малаялам, латинізована гінді, іспанська, російська,словацька, телугу та українська.</p> <p xml:lang="x-test">xxKLettres is an application specially designed to help the user to learn an alphabet in a new language and then to learn to read simple syllables. The user can be a young child aged from two and a half or an adult that wants to learn the basics of a foreign language. There are currently 25 languages available: Arabian, Brazilian Portuguese, Czech, Danish, Dutch, British English, US English, Phonics English, French, German, Hebrew, Hungarian, Italian, Kannada, Low Saxon, Malayalam, Norwegian Bokmål, Punjabi, Luganda, Romanized Hindi, Russian, Spanish, Slovak, Telugu and Ukrainian. KLettres provides a special user interface and themes for younger users.xx</p> <p xml:lang="zh-TW">KLettres 是一套特別設計協助使用者學習新語言的字母，並且學會讀簡單音節的應用程式。使用者可以是兩歲半的孩子，或是想學新外語的成人。目前有包括阿拉伯語、巴西葡萄牙語、捷克語、丹麥語、荷蘭語、英式英語、美式英語等等 25 種語言。KLettres 針對小小孩也提供了一套特別的使用者介面。</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-15.08.3/src/klettres.cpp new/klettres-15.12.0/src/klettres.cpp --- old/klettres-15.08.3/src/klettres.cpp 2015-11-04 19:34:33.000000000 +0100 +++ new/klettres-15.12.0/src/klettres.cpp 2015-11-04 15:26:40.000000000 +0100 @@ -68,7 +68,7 @@ KLettres::KLettres() : KXmlGuiWindow( 0) { - setObjectName( QLatin1String("KLettres") ); + setObjectName( QStringLiteral("KLettres") ); mNewStuff = 0; m_view = new KLettresView(this); setMinimumSize( QSize( 800, 600 ) ); @@ -124,23 +124,23 @@ void KLettres::setupActions() { - QAction *m_newAction = actionCollection()->addAction("play_new"); + QAction *m_newAction = actionCollection()->addAction(QStringLiteral("play_new")); m_newAction->setText(i18n("New Sound")); actionCollection()->setDefaultShortcut(m_newAction,QKeySequence(Qt::CTRL+Qt::Key_N)); - m_newAction->setIcon(QIcon::fromTheme("document-new")); // ### better icon for this? + m_newAction->setIcon(QIcon::fromTheme(QStringLiteral("document-new"))); // ### better icon for this? connect(m_newAction, &QAction::triggered, m_view, &KLettresView::game); m_newAction->setToolTip(i18n("Play a new sound")); m_newAction->setWhatsThis(i18n("You can play a new sound by clicking this button or using the File menu, New Sound.")); - QAction *m_stuffAction = actionCollection()->addAction("downloadnewstuff"); + QAction *m_stuffAction = actionCollection()->addAction(QStringLiteral("downloadnewstuff")); m_stuffAction->setText(i18n("Get Alphabet in New Language...")); - m_stuffAction->setIcon(QIcon::fromTheme("get-hot-new-stuff")); + m_stuffAction->setIcon(QIcon::fromTheme(QStringLiteral("get-hot-new-stuff"))); connect(m_stuffAction, &QAction::triggered, this, &KLettres::slotDownloadNewStuff); - QAction *m_playAgainAction = actionCollection()->addAction("play_again"); + QAction *m_playAgainAction = actionCollection()->addAction(QStringLiteral("play_again")); m_playAgainAction->setText(i18n("Replay Sound")); actionCollection()->setDefaultShortcut(m_playAgainAction,QKeySequence(Qt::Key_F5)); - m_playAgainAction->setIcon(QIcon::fromTheme("media-playback-start")); + m_playAgainAction->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start"))); m_playAgainAction->setToolTip(i18n("Play the same sound again")); connect(m_playAgainAction, &QAction::triggered, m_view, &KLettresView::slotPlayAgain); m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound.")); @@ -148,12 +148,12 @@ m_menubarAction = KStandardAction::showMenubar(this, SLOT(slotMenubar()), actionCollection()); - m_levelAction = actionCollection()->add<KSelectAction>("levels"); + m_levelAction = actionCollection()->add<KSelectAction>(QStringLiteral("levels")); m_levelAction->setText(i18nc("@label:listbox which difficulty level to use", "L&evel")); m_levelAction->setToolTip(i18n("Select the level")); m_levelAction->setWhatsThis(i18n("You can select the level: level 1 displays a letter and you hear it; level 2 does not display the letter, you only hear it; level 3 displays a syllable and you hear it; level 4 does not display the syllable, you only hear it.")); - m_languageAction = actionCollection()->add<KSelectAction>("languages"); + m_languageAction = actionCollection()->add<KSelectAction>(QStringLiteral("languages")); m_languageAction->setText(i18nc("@label:listbox", "&Language")); m_languageAction->setItems(m_languageNames); @@ -164,24 +164,24 @@ m_levelAction->setItems(m_levelsNames); m_levelAction->setCurrentItem(Prefs::level()-1); - m_themeAction = actionCollection()->add<KSelectAction>("looks"); + m_themeAction = actionCollection()->add<KSelectAction>(QStringLiteral("looks")); m_themeAction->setText(i18n("Themes")); m_themeAction->setItems(KLThemeFactory::instance()->themeList()); m_themeAction->setCurrentItem(Prefs::theme()); m_themeAction->setToolTip(i18n("Select the theme")); m_themeAction->setWhatsThis(i18n("Here you can change the theme for KLettres. A theme consists in the background picture and the font color for the letter displayed.")); - m_kidAction = actionCollection()->add<KToggleAction>("mode_kid"); + m_kidAction = actionCollection()->add<KToggleAction>(QStringLiteral("mode_kid")); m_kidAction->setText(i18n("Mode Kid")); actionCollection()->setDefaultShortcut(m_kidAction,QKeySequence(Qt::CTRL+Qt::Key_K)); - m_kidAction->setIcon(QIcon::fromTheme("klettres_kids")); + m_kidAction->setIcon(QIcon::fromTheme(QStringLiteral("klettres_kids"))); connect(m_kidAction, &KToggleAction::triggered, this, &KLettres::slotModeKid); m_kidAction->setWhatsThis(i18n("If you are in the Grown-up mode, clicking on this button will set up the Kid mode. The Kid mode has no menubar and the font is bigger in the statusbar.")); - m_grownupAction = actionCollection()->add<KToggleAction>("mode_grownup"); + m_grownupAction = actionCollection()->add<KToggleAction>(QStringLiteral("mode_grownup")); m_grownupAction->setText(i18n("Mode Grown-up")); actionCollection()->setDefaultShortcut(m_grownupAction,QKeySequence(Qt::CTRL+Qt::Key_G)); - m_grownupAction->setIcon(QIcon::fromTheme("klettres_grownup")); + m_grownupAction->setIcon(QIcon::fromTheme(QStringLiteral("klettres_grownup"))); connect(m_grownupAction, &KToggleAction::triggered, this, &KLettres::slotModeGrownup); m_grownupAction->setWhatsThis(i18n("The Grownup mode is the normal mode where you can see the menubar.")); @@ -208,22 +208,22 @@ void KLettres::setupToolbars() { // Toolbar for special characters - specialCharToolbar = toolBar("specialCharToolbar"); + specialCharToolbar = toolBar(QStringLiteral("specialCharToolbar")); addToolBar ( Qt::BottomToolBarArea, specialCharToolbar); } void KLettres::optionsPreferences() { - if(KConfigDialog::showDialog("settings")) { + if(KConfigDialog::showDialog(QStringLiteral("settings"))) { return; } - KConfigDialog *dialog = new KConfigDialog(this, "settings", Prefs::self()); - dialog->addPage(new fontsdlg(0), i18n("Font Settings"), "preferences-desktop-font"); + KConfigDialog *dialog = new KConfigDialog(this, QStringLiteral("settings"), Prefs::self()); + dialog->addPage(new fontsdlg(0), i18n("Font Settings"), QStringLiteral("preferences-desktop-font")); //fontsdlg is the page name, mFont is the widget name, Font Settings is the page display string //fonts is the icon Timer *m_timer = new Timer(); - dialog->addPage(m_timer, i18n("Timer"), "chronometer"); + dialog->addPage(m_timer, i18n("Timer"), QStringLiteral("chronometer")); connect(dialog, &KConfigDialog::settingsChanged, this, &KLettres::slotUpdateSettings); dialog->setAttribute( Qt::WA_DeleteOnClose ); // dialog->setHelp(QString(), "klettres"); @@ -233,7 +233,7 @@ void KLettres::loadSettings() { if (LangUtils::getLanguages().indexOf(Prefs::language()) < 0) { - Prefs::setLanguage("en"); + Prefs::setLanguage(QStringLiteral("en")); } QString langString = LangUtils::getLanguagesNames(LangUtils::getLanguages())[LangUtils::getLanguages().indexOf(Prefs::language())]; m_languageAction->setCurrentItem(LangUtils::getLanguages().indexOf(Prefs::language())); @@ -257,7 +257,7 @@ void KLettres::slotDownloadNewStuff() { - QPointer<KNS3::DownloadDialog> dialog(new KNS3::DownloadDialog("klettres.knsrc", this)); + QPointer<KNS3::DownloadDialog> dialog(new KNS3::DownloadDialog(QStringLiteral("klettres.knsrc"), this)); if ( dialog->exec() == QDialog::Accepted ) { // do nothing } @@ -344,7 +344,7 @@ QPalette pal; pal.setColor( QPalette::Background, Qt::white); statusBar()->setPalette( pal ); - QFont f_lab( "Serif" , 10); //font for statusBar + QFont f_lab( QStringLiteral("Serif") , 10); //font for statusBar m_levLabel->setFont(f_lab); m_langLabel->setFont(f_lab); m_menubarAction->setChecked(true); @@ -363,7 +363,7 @@ QPalette pal; pal.setColor( QPalette::Background, Qt::white); statusBar()->setPalette( pal ); - QFont f_lab( "Serif" , 12); //font for statusBar + QFont f_lab( QStringLiteral("Serif") , 12); //font for statusBar f_lab.setBold(true); m_levLabel->setFont(f_lab); m_langLabel->setFont(f_lab); @@ -386,7 +386,7 @@ if (LangUtils::hasSpecialChars(lang)) {//Dutch, English, French and Italian have no special characters allData.clear(); - QString myString=QString("klettres/%1.txt").arg(lang); + QString myString=QStringLiteral("klettres/%1.txt").arg(lang); QFile myFile; myFile.setFileName(QStandardPaths::locate(QStandardPaths::GenericDataLocation, myString)); @@ -457,7 +457,7 @@ ///A font to draw the character with QFont font; - font.setFamily( "Arial" ); + font.setFamily( QStringLiteral("Arial") ); font.setPixelSize(120); font.setWeight(QFont::Normal); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-15.08.3/src/klettresview.cpp new/klettres-15.12.0/src/klettresview.cpp --- old/klettres-15.08.3/src/klettresview.cpp 2015-11-04 19:34:33.000000000 +0100 +++ new/klettres-15.12.0/src/klettresview.cpp 2015-11-04 15:26:40.000000000 +0100 @@ -92,7 +92,7 @@ return; QString svgpath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, - QString("klettres/pics/%1/%2").arg(theme->name(), theme->svgFileName())); + QStringLiteral("klettres/pics/%1/%2").arg(theme->name(), theme->svgFileName())); // we don't allow themes with no svg installed if (!QFile::exists(svgpath)) { @@ -106,7 +106,7 @@ m_theme->backgroundInputColor().getRgb(&r1, &g1, &b1); int r2, g2, b2; m_theme->letterInputColor().getRgb(&r2, &g2, &b2); - m_letterEdit->setStyleSheet(QString("border-style: solid; background-color: rgb(%1, %2, %3); color: rgb(%4, %5, %6) ; border-color: rgb(%4, %5, %6); border-bottom-right-radius:10; border-radius: 15px; border-width: 3px").arg(r1).arg(g1).arg(b1).arg(r2).arg(g2).arg(b2)); + m_letterEdit->setStyleSheet(QStringLiteral("border-style: solid; background-color: rgb(%1, %2, %3); color: rgb(%4, %5, %6) ; border-color: rgb(%4, %5, %6); border-bottom-right-radius:10; border-radius: 15px; border-width: 3px").arg(r1).arg(g1).arg(b1).arg(r2).arg(g2).arg(b2)); m_renderer->load(svgpath); m_backgroundCache = QPixmap(); @@ -190,7 +190,7 @@ m_letterEdit->selectAll(); m_letterEdit->cut(); m_letterEdit->setText(m_upperLetter); - QTimer::singleShot(m_timer*100, this, SLOT(slotTimerDone())); + QTimer::singleShot(m_timer*100, this, &KLettresView::slotTimerDone); } else { qCDebug(KLETTRES_LOG) << "cursor " << m_cursorPos << endl; m_letterEdit->backspace(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-15.08.3/src/kltheme.cpp new/klettres-15.12.0/src/kltheme.cpp --- old/klettres-15.08.3/src/kltheme.cpp 2015-11-04 19:34:33.000000000 +0100 +++ new/klettres-15.12.0/src/kltheme.cpp 2015-11-04 15:26:40.000000000 +0100 @@ -41,7 +41,7 @@ virtual QString name() const { - return "kids"; + return QStringLiteral("kids"); } virtual QString uiName() const @@ -51,7 +51,7 @@ virtual QString svgFileName() const { - return "klettres_kids.svg"; + return QStringLiteral("klettres_kids.svg"); } virtual QColor letterColor() const @@ -91,7 +91,7 @@ virtual QString name() const { - return "desert"; + return QStringLiteral("desert"); } virtual QString uiName() const @@ -101,7 +101,7 @@ virtual QString svgFileName() const { - return "klettres_desert.svg"; + return QStringLiteral("klettres_desert.svg"); } virtual QColor letterColor() const @@ -141,7 +141,7 @@ virtual QString name() const { - return "savannah"; + return QStringLiteral("savannah"); } virtual QString uiName() const @@ -151,7 +151,7 @@ virtual QString svgFileName() const { - return "klettres_savannah.svg"; + return QStringLiteral("klettres_savannah.svg"); } virtual QColor letterColor() const @@ -192,7 +192,7 @@ virtual QString name() const { - return "aqua"; + return QStringLiteral("aqua"); } virtual QString uiName() const @@ -202,7 +202,7 @@ virtual QString svgFileName() const { - return "klettres_aqua.svg"; + return QStringLiteral("klettres_aqua.svg"); } virtual QColor letterColor() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-15.08.3/src/langutils.cpp new/klettres-15.12.0/src/langutils.cpp --- old/klettres-15.08.3/src/langutils.cpp 2015-11-04 19:34:33.000000000 +0100 +++ new/klettres-15.12.0/src/langutils.cpp 2015-11-04 15:26:40.000000000 +0100 @@ -28,24 +28,24 @@ bool LangUtils::hasSpecialChars(const QString& lang) { - if (lang== "cs" - || lang== "da" - || lang== "sk" - || lang== "es" - || lang== "de" - || lang== "hu" - || lang== "nds" - || lang== "lt") + if (lang== QLatin1String("cs") + || lang== QLatin1String("da") + || lang== QLatin1String("sk") + || lang== QLatin1String("es") + || lang== QLatin1String("de") + || lang== QLatin1String("hu") + || lang== QLatin1String("nds") + || lang== QLatin1String("lt")) return true; return false; } bool LangUtils::isIndian(const QString& lang) { - if (lang == "kn" - || lang == "ml" - || lang == "te" - || lang == "pa") + if (lang == QLatin1String("kn") + || lang == QLatin1String("ml") + || lang == QLatin1String("te") + || lang == QLatin1String("pa")) return true; return false; } @@ -56,7 +56,7 @@ m_languages.clear(); //the program scans in klettres/data/ to see what languages data is found const QStringList mdirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, - "klettres/", + QStringLiteral("klettres/"), QStandardPaths::LocateDirectory); //qDebug() << mdirs; @@ -64,12 +64,12 @@ for (QStringList::const_iterator it =mdirs.constBegin(); it !=mdirs.constEnd(); ++it ) { QDir dir(*it); m_languages += dir.entryList(QDir::Dirs, QDir::Name); - m_languages.removeAll("."); - m_languages.removeAll(".."); + m_languages.removeAll(QStringLiteral(".")); + m_languages.removeAll(QStringLiteral("..")); } - m_languages.removeAll("pics"); - m_languages.removeAll("data"); - m_languages.removeAll("icons"); + m_languages.removeAll(QStringLiteral("pics")); + m_languages.removeAll(QStringLiteral("data")); + m_languages.removeAll(QStringLiteral("icons")); m_languages.sort(); //find duplicated entries in KDEDIR and KDEHOME @@ -96,11 +96,11 @@ QStringList languagesNames; foreach(const QString &language, languagesList) { - if (language == "hi-ro") { + if (language == QLatin1String("hi-ro")) { languagesNames.append(i18n("Romanized Hindi")); - } else if (language == "lug_UG") { + } else if (language == QLatin1String("lug_UG")) { languagesNames.append(i18n("Luganda")); - } else if (language == "ep") { + } else if (language == QLatin1String("ep")) { languagesNames.append(i18n("English Phonics")); } else { QLocale locale(language); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-15.08.3/src/main.cpp new/klettres-15.12.0/src/main.cpp --- old/klettres-15.08.3/src/main.cpp 2015-11-04 19:34:33.000000000 +0100 +++ new/klettres-15.12.0/src/main.cpp 2015-11-04 15:26:40.000000000 +0100 @@ -45,32 +45,32 @@ QStringList configFiles; QStringList rcFiles; - configFiles << QLatin1String("klettresrc"); - rcFiles << QLatin1String("klettresui.rc"); - Kdelibs4ConfigMigrator migrator(QLatin1String("klettres")); + configFiles << QStringLiteral("klettresrc"); + rcFiles << QStringLiteral("klettresui.rc"); + Kdelibs4ConfigMigrator migrator(QStringLiteral("klettres")); migrator.setConfigFiles(configFiles); migrator.setUiFiles(rcFiles); migrator.migrate(); - KAboutData about("klettres", i18n("KLettres"), QLatin1String(KLETTRES_VERSION), i18n(description), - KAboutLicense::GPL, i18n("(C) 2001-2011 Anne-Marie Mahfouf"),QString(), QLatin1String("http://edu.kde.org/klettres";), QLatin1String("[email protected]")); - about.addAuthor( i18n("Anne-Marie Mahfouf"), QString(), "annma AT kde DOT org", "http://annma.blogspot.com";, "annma"); + KAboutData about(QStringLiteral("klettres"), i18n("KLettres"), QStringLiteral(KLETTRES_VERSION), i18n(description), + KAboutLicense::GPL, i18n("(C) 2001-2011 Anne-Marie Mahfouf"),QString(), QStringLiteral("http://edu.kde.org/klettres";), QStringLiteral("[email protected]")); + about.addAuthor( i18n("Anne-Marie Mahfouf"), QString(), QStringLiteral("annma AT kde DOT org"), QStringLiteral("http://annma.blogspot.com";), QStringLiteral("annma")); about.addCredit(i18n("Marc Cheng"), - i18n("Kids and grown-up oxygen icons"), "bdgraue AT web DOT de"); + i18n("Kids and grown-up oxygen icons"), QStringLiteral("bdgraue AT web DOT de")); about.addCredit(i18n("Danny Allen"), - i18n("SVG background pictures"), "dannya40uk AT yahoo DOT co DOT uk"); + i18n("SVG background pictures"), QStringLiteral("dannya40uk AT yahoo DOT co DOT uk")); about.addCredit(i18n("Robert Gogolok"), - i18n("Support and coding guidance"), "mail AT robert-gogolok DOT de"); + i18n("Support and coding guidance"), QStringLiteral("mail AT robert-gogolok DOT de")); about.addCredit(i18n("Peter Hedlund"), - i18n("Code for generating special characters' icons"), "peter DOT hedlund AT kdemail DOT net"); + i18n("Code for generating special characters' icons"), QStringLiteral("peter DOT hedlund AT kdemail DOT net")); about.addCredit(i18n("Waldo Bastian"), - i18n("Port to KConfig XT, coding help"), "bastian AT kde DOT org"); + i18n("Port to KConfig XT, coding help"), QStringLiteral("bastian AT kde DOT org")); about.addCredit(i18n("Pino Toscano"), - i18n("Code cleaning, Theme class"), "toscano DOT pino AT tiscali DOT it"); + i18n("Code cleaning, Theme class"), QStringLiteral("toscano DOT pino AT tiscali DOT it")); about.addCredit(i18n("Michael Goettsche"), - i18n("Timer setting widgets"), "michael.goettsche AT kdemail DOT net"); + i18n("Timer setting widgets"), QStringLiteral("michael.goettsche AT kdemail DOT net")); about.addCredit(i18n("Laurent Navet"), - i18n("Port to KDE Frameworks 5"), "laurent DOT navet+klettres AT gmail DOT com"); + i18n("Port to KDE Frameworks 5"), QStringLiteral("laurent DOT navet+klettres AT gmail DOT com")); QCommandLineParser parser; KAboutData::setApplicationData(about); parser.addVersionOption(); @@ -79,9 +79,9 @@ parser.process(app); about.processCommandLine(&parser); - app.setApplicationName("klettres"); + app.setApplicationName(QStringLiteral("klettres")); app.setApplicationVersion(version); - app.setOrganizationDomain("kde.org"); + app.setOrganizationDomain(QStringLiteral("kde.org")); app.setApplicationDisplayName(i18n("Klettres")); // see if we are starting with session management diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-15.08.3/src/soundfactory.cpp new/klettres-15.12.0/src/soundfactory.cpp --- old/klettres-15.08.3/src/soundfactory.cpp 2015-11-04 19:34:33.000000000 +0100 +++ new/klettres-15.12.0/src/soundfactory.cpp 2015-11-04 15:26:40.000000000 +0100 @@ -117,11 +117,11 @@ soundNameElement; QDomAttr nameAttribute, fileAttribute; - languagesList = layoutDocument.elementsByTagName("language"); + languagesList = layoutDocument.elementsByTagName(QStringLiteral("language")); QDomAttr codeAttribute; //check if the sound files match current language languageElement = (const QDomElement &) languagesList.item(0).toElement(); - codeAttribute = languageElement.attributeNode("code"); + codeAttribute = languageElement.attributeNode(QStringLiteral("code")); if (currentLanguage != codeAttribute.value()) { qCDebug(KLETTRES_LOG) << "Fail reading language !!! "; @@ -130,8 +130,8 @@ qCDebug(KLETTRES_LOG) << "current language " << currentLanguage; } //check here if alphabet and syllables both exist - alphabetList = languageElement.elementsByTagName("alphabet"); - syllablesList = languageElement.elementsByTagName("syllables"); + alphabetList = languageElement.elementsByTagName(QStringLiteral("alphabet")); + syllablesList = languageElement.elementsByTagName(QStringLiteral("syllables")); //load the sounds for level 1 and 2 (alphabet) if ((Prefs::level() == 1) || (Prefs::level() == 2)) { @@ -139,7 +139,7 @@ return false; } alphabetElement = (const QDomElement &) alphabetList.item(0).toElement(); - soundNamesList = alphabetElement.elementsByTagName("sound"); + soundNamesList = alphabetElement.elementsByTagName(QStringLiteral("sound")); } //load the sounds for level 3 and 4 (syllables) @@ -152,7 +152,7 @@ syllableElement = (const QDomElement &) syllablesList.item(0).toElement(); - soundNamesList = syllableElement.elementsByTagName("sound"); + soundNamesList = syllableElement.elementsByTagName(QStringLiteral("sound")); } //Counts the number of sounds sounds = soundNamesList.count(); @@ -165,10 +165,10 @@ for (uint sound = 0; sound < sounds; sound++) { soundNameElement = (const QDomElement &) soundNamesList.item(sound).toElement(); - nameAttribute = soundNameElement.attributeNode("name"); + nameAttribute = soundNameElement.attributeNode(QStringLiteral("name")); //namesList helds the names of the letter or syllable to display namesList.append(nameAttribute.value()); - fileAttribute = soundNameElement.attributeNode("file"); + fileAttribute = soundNameElement.attributeNode(QStringLiteral("file")); //filesList helds the names of the sound files (i.e the location of the sounds like fr/alpha/a-0.mp3) filesList.append(fileAttribute.value()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-15.08.3/tests/malayalamtest.cpp new/klettres-15.12.0/tests/malayalamtest.cpp --- old/klettres-15.08.3/tests/malayalamtest.cpp 2015-11-04 19:34:33.000000000 +0100 +++ new/klettres-15.12.0/tests/malayalamtest.cpp 2015-11-04 15:26:40.000000000 +0100 @@ -25,7 +25,7 @@ { // Initial string that we want to separate into chars // You need to have Malayalam fonts installed - QString string = QString::fromUtf8("യേ"); + QString string = QStringLiteral("യേ"); //get first char and compare QCOMPARE(QString::fromUtf8("യ"), string.left(1)); @@ -37,7 +37,7 @@ void MalayalamTest::decomposeConsonant() { // Initial consonant that we want to separate into letters - QString string = QString::fromUtf8("ഘൊ"); + QString string = QStringLiteral("ഘൊ"); QCOMPARE(string.length(), 3); //first letter
