diff options
Diffstat (limited to 'autotests')
22 files changed, 394 insertions, 394 deletions
diff --git a/autotests/kconfig_compiler/test1.cpp.ref b/autotests/kconfig_compiler/test1.cpp.ref index dcb3ffcb..f0432d45 100644 --- a/autotests/kconfig_compiler/test1.cpp.ref +++ b/autotests/kconfig_compiler/test1.cpp.ref @@ -4,66 +4,66 @@ #include "test1.h" Test1::Test1( const QString & transport, const QString & folder ) - : KConfigSkeleton( QLatin1String( "examplerc" ) ) + : KConfigSkeleton( QStringLiteral( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { - setCurrentGroup( QString( QLatin1String( "General-%1" ) ).arg( mParamfolder ) ); + setCurrentGroup( QStringLiteral( "General-%1" ).arg( mParamfolder ) ); KConfigSkeleton::ItemBool *itemOneOption; - itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "OneOption" ), mOneOption, true ); - addItem( itemOneOption, QLatin1String( "OneOption" ) ); + itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "OneOption" ), mOneOption, true ); + addItem( itemOneOption, QStringLiteral( "OneOption" ) ); KConfigSkeleton::ItemInt *itemAnotherOption; - itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Another Option" ), mAnotherOption, 5 ); - addItem( itemAnotherOption, QLatin1String( "AnotherOption" ) ); + itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Another Option" ), mAnotherOption, 5 ); + addItem( itemAnotherOption, QStringLiteral( "AnotherOption" ) ); QList<KConfigSkeleton::ItemEnum::Choice> valuesListOption; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("One"); + choice.name = QStringLiteral("One"); valuesListOption.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("Two"); + choice.name = QStringLiteral("Two"); valuesListOption.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("Three"); + choice.name = QStringLiteral("Three"); valuesListOption.append( choice ); } KConfigSkeleton::ItemEnum *itemListOption; - itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); - addItem( itemListOption, QLatin1String( "ListOption" ) ); + itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), QStringLiteral( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); + addItem( itemListOption, QStringLiteral( "ListOption" ) ); - setCurrentGroup( QLatin1String( "MyOptions" ) ); + setCurrentGroup( QStringLiteral( "MyOptions" ) ); KConfigSkeleton::ItemString *itemMyString; - itemMyString = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "MyString" ), mMyString, QLatin1String( "Default String" ) ); - addItem( itemMyString, QLatin1String( "MyString" ) ); + itemMyString = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "MyString" ), mMyString, QStringLiteral( "Default String" ) ); + addItem( itemMyString, QStringLiteral( "MyString" ) ); KConfigSkeleton::ItemPath *itemMyPath; - itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), QLatin1String( "MyPath" ), mMyPath, QDir::homePath()+QString::fromLatin1(".hidden_file") ); - addItem( itemMyPath, QLatin1String( "MyPath" ) ); + itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), QStringLiteral( "MyPath" ), mMyPath, QDir::homePath()+QString::fromLatin1(".hidden_file") ); + addItem( itemMyPath, QStringLiteral( "MyPath" ) ); KConfigSkeleton::ItemInt *itemAnotherOption2; - itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Another Option" ), mAnotherOption2, 10 ); - addItem( itemAnotherOption2, QLatin1String( "AnotherOption2" ) ); + itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Another Option" ), mAnotherOption2, 10 ); + addItem( itemAnotherOption2, QStringLiteral( "AnotherOption2" ) ); QStringList defaultMyStringList; defaultMyStringList.append( QString::fromUtf8( "up" ) ); defaultMyStringList.append( QString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), QLatin1String( "MyStringList" ), mMyStringList, defaultMyStringList ); - addItem( itemMyStringList, QLatin1String( "MyStringList" ) ); + itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), QStringLiteral( "MyStringList" ), mMyStringList, defaultMyStringList ); + addItem( itemMyStringList, QStringLiteral( "MyStringList" ) ); QStringList defaultMyStringListHidden; defaultMyStringListHidden.append( QString::fromUtf8( "up" ) ); defaultMyStringListHidden.append( QString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringListHidden; - itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), QLatin1String( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); - addItem( itemMyStringListHidden, QLatin1String( "MyStringListHidden" ) ); + itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), QStringLiteral( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); + addItem( itemMyStringListHidden, QStringLiteral( "MyStringListHidden" ) ); KConfigSkeleton::ItemInt *itemMyNumber; - itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), QString( QLatin1String( "List-%1-%2" ) ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); - addItem( itemMyNumber, QLatin1String( "MyNumber" ) ); + itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); + addItem( itemMyNumber, QStringLiteral( "MyNumber" ) ); } Test1::~Test1() diff --git a/autotests/kconfig_compiler/test10.cpp.ref b/autotests/kconfig_compiler/test10.cpp.ref index f067cc68..a84bee30 100644 --- a/autotests/kconfig_compiler/test10.cpp.ref +++ b/autotests/kconfig_compiler/test10.cpp.ref @@ -25,18 +25,18 @@ Test10 *Test10::self() } Test10::Test10( ) - : KConfigSkeleton( QLatin1String( "test10rc" ) ) + : KConfigSkeleton( QStringLiteral( "test10rc" ) ) { Q_ASSERT(!s_globalTest10()->q); s_globalTest10()->q = this; - setCurrentGroup( QLatin1String( "Foo" ) ); + setCurrentGroup( QStringLiteral( "Foo" ) ); KConfigSkeleton::ItemUrl *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemUrl( currentGroup(), QLatin1String( "foo bar" ), mFooBar ); - addItem( itemFooBar, QLatin1String( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemUrl( currentGroup(), QStringLiteral( "foo bar" ), mFooBar ); + addItem( itemFooBar, QStringLiteral( "FooBar" ) ); KConfigSkeleton::ItemUrlList *itemBarFoo; - itemBarFoo = new KConfigSkeleton::ItemUrlList( currentGroup(), QLatin1String( "bar foo" ), mBarFoo ); - addItem( itemBarFoo, QLatin1String( "BarFoo" ) ); + itemBarFoo = new KConfigSkeleton::ItemUrlList( currentGroup(), QStringLiteral( "bar foo" ), mBarFoo ); + addItem( itemBarFoo, QStringLiteral( "BarFoo" ) ); } Test10::~Test10() diff --git a/autotests/kconfig_compiler/test11.cpp.ref b/autotests/kconfig_compiler/test11.cpp.ref index 1e6ff9e2..76792357 100644 --- a/autotests/kconfig_compiler/test11.cpp.ref +++ b/autotests/kconfig_compiler/test11.cpp.ref @@ -4,129 +4,129 @@ #include "test11.h" Test11::Test11( ) - : MyPrefs( QLatin1String( "korganizerrc" ) ) + : MyPrefs( QStringLiteral( "korganizerrc" ) ) { - setCurrentGroup( QLatin1String( "General" ) ); + setCurrentGroup( QStringLiteral( "General" ) ); - mAutoSaveItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "Auto Save" ), mAutoSave, false ); + mAutoSaveItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "Auto Save" ), mAutoSave, false ); mAutoSaveItem->setLabel( QCoreApplication::translate("Test11", "Enable automatic saving of calendar") ); mAutoSaveItem->setWhatsThis( QCoreApplication::translate("Test11", "WhatsThis text for AutoSave option") ); - addItem( mAutoSaveItem, QLatin1String( "AutoSave" ) ); - mAutoSaveIntervalItem = new MyPrefs::ItemInt( currentGroup(), QLatin1String( "Auto Save Interval" ), mAutoSaveInterval, 10 ); + addItem( mAutoSaveItem, QStringLiteral( "AutoSave" ) ); + mAutoSaveIntervalItem = new MyPrefs::ItemInt( currentGroup(), QStringLiteral( "Auto Save Interval" ), mAutoSaveInterval, 10 ); mAutoSaveIntervalItem->setLabel( QCoreApplication::translate("Test11", "Auto Save Interval") ); - addItem( mAutoSaveIntervalItem, QLatin1String( "AutoSaveInterval" ) ); - mConfirmItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "Confirm Deletes" ), mConfirm, true ); + addItem( mAutoSaveIntervalItem, QStringLiteral( "AutoSaveInterval" ) ); + mConfirmItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "Confirm Deletes" ), mConfirm, true ); mConfirmItem->setLabel( QCoreApplication::translate("Test11", "Confirm deletes") ); - addItem( mConfirmItem, QLatin1String( "Confirm" ) ); - mArchiveFileItem = new MyPrefs::ItemString( currentGroup(), QLatin1String( "Archive File" ), mArchiveFile ); + addItem( mConfirmItem, QStringLiteral( "Confirm" ) ); + mArchiveFileItem = new MyPrefs::ItemString( currentGroup(), QStringLiteral( "Archive File" ), mArchiveFile ); mArchiveFileItem->setLabel( QCoreApplication::translate("Test11", "Archive File") ); - addItem( mArchiveFileItem, QLatin1String( "ArchiveFile" ) ); + addItem( mArchiveFileItem, QStringLiteral( "ArchiveFile" ) ); QList<MyPrefs::ItemEnum::Choice> valuesDestination; { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("standardDestination"); + choice.name = QStringLiteral("standardDestination"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("askDestination"); + choice.name = QStringLiteral("askDestination"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("argl1"); + choice.name = QStringLiteral("argl1"); choice.label = QCoreApplication::translate("Test11", "Argl1 Label"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("argl2"); + choice.name = QStringLiteral("argl2"); choice.whatsThis = QCoreApplication::translate("Test11", "Argl2 Whatsthis"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("argl3"); + choice.name = QStringLiteral("argl3"); choice.label = QCoreApplication::translate("Test11", "Argl3 Label"); choice.whatsThis = QCoreApplication::translate("Test11", "Argl3 Whatsthis"); valuesDestination.append( choice ); } - mDestinationItem = new MyPrefs::ItemEnum( currentGroup(), QLatin1String( "Destination" ), mDestination, valuesDestination, EnumDestination::standardDestination ); + mDestinationItem = new MyPrefs::ItemEnum( currentGroup(), QStringLiteral( "Destination" ), mDestination, valuesDestination, EnumDestination::standardDestination ); mDestinationItem->setLabel( QCoreApplication::translate("Test11", "New Events/Todos Should") ); - addItem( mDestinationItem, QLatin1String( "Destination" ) ); + addItem( mDestinationItem, QStringLiteral( "Destination" ) ); - setCurrentGroup( QLatin1String( "Views" ) ); + setCurrentGroup( QStringLiteral( "Views" ) ); - mHourSizeItem = new MyPrefs::ItemInt( currentGroup(), QLatin1String( "Hour Size" ), mHourSize, 10 ); + mHourSizeItem = new MyPrefs::ItemInt( currentGroup(), QStringLiteral( "Hour Size" ), mHourSize, 10 ); mHourSizeItem->setLabel( QCoreApplication::translate("Test11", "Hour Size") ); - addItem( mHourSizeItem, QLatin1String( "HourSize" ) ); - mSelectionStartsEditorItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); + addItem( mHourSizeItem, QStringLiteral( "HourSize" ) ); + mSelectionStartsEditorItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); mSelectionStartsEditorItem->setLabel( QCoreApplication::translate("Test11", "Time range selection in agenda view starts event editor") ); - addItem( mSelectionStartsEditorItem, QLatin1String( "SelectionStartsEditor" ) ); + addItem( mSelectionStartsEditorItem, QStringLiteral( "SelectionStartsEditor" ) ); - setCurrentGroup( QLatin1String( "KOrganizer Plugins" ) ); + setCurrentGroup( QStringLiteral( "KOrganizer Plugins" ) ); QStringList defaultSelectedPlugins; defaultSelectedPlugins.append( QString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( QString::fromUtf8( "webexport" ) ); - mSelectedPluginsItem = new MyPrefs::ItemStringList( currentGroup(), QLatin1String( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); + mSelectedPluginsItem = new MyPrefs::ItemStringList( currentGroup(), QStringLiteral( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); mSelectedPluginsItem->setLabel( QCoreApplication::translate("Test11", "SelectedPlugins") ); - addItem( mSelectedPluginsItem, QLatin1String( "SelectedPlugins" ) ); + addItem( mSelectedPluginsItem, QStringLiteral( "SelectedPlugins" ) ); - setCurrentGroup( QLatin1String( "Colors" ) ); + setCurrentGroup( QStringLiteral( "Colors" ) ); - mHighlightColorItem = new MyPrefs::ItemColor( currentGroup(), QLatin1String( "Highlight Color" ), mHighlightColor, QColor( 100, 100, 255 ) ); + mHighlightColorItem = new MyPrefs::ItemColor( currentGroup(), QStringLiteral( "Highlight Color" ), mHighlightColor, QColor( 100, 100, 255 ) ); mHighlightColorItem->setLabel( QCoreApplication::translate("Test11", "Highlight color") ); - addItem( mHighlightColorItem, QLatin1String( "HighlightColor" ) ); - mAgendaBgColorItem = new MyPrefs::ItemColor( currentGroup(), QLatin1String( "Agenda Background Color" ), mAgendaBgColor, QColor( 255, 255, 255 ) ); + addItem( mHighlightColorItem, QStringLiteral( "HighlightColor" ) ); + mAgendaBgColorItem = new MyPrefs::ItemColor( currentGroup(), QStringLiteral( "Agenda Background Color" ), mAgendaBgColor, QColor( 255, 255, 255 ) ); mAgendaBgColorItem->setLabel( QCoreApplication::translate("Test11", "Agenda view background color") ); - addItem( mAgendaBgColorItem, QLatin1String( "AgendaBgColor" ) ); + addItem( mAgendaBgColorItem, QStringLiteral( "AgendaBgColor" ) ); - setCurrentGroup( QLatin1String( "Fonts" ) ); + setCurrentGroup( QStringLiteral( "Fonts" ) ); - mTimeBarFontItem = new MyPrefs::ItemFont( currentGroup(), QLatin1String( "TimeBar Font" ), mTimeBarFont ); + mTimeBarFontItem = new MyPrefs::ItemFont( currentGroup(), QStringLiteral( "TimeBar Font" ), mTimeBarFont ); mTimeBarFontItem->setLabel( QCoreApplication::translate("Test11", "Time bar") ); - addItem( mTimeBarFontItem, QLatin1String( "TimeBarFont" ) ); + addItem( mTimeBarFontItem, QStringLiteral( "TimeBarFont" ) ); - setCurrentGroup( QLatin1String( "Email" ) ); + setCurrentGroup( QStringLiteral( "Email" ) ); QList<MyPrefs::ItemEnum::Choice> valuesEmailClient; { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("sendmail"); + choice.name = QStringLiteral("sendmail"); choice.label = /*: @option */ QCoreApplication::translate("Test11", "Sendmail"); valuesEmailClient.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("kmail"); + choice.name = QStringLiteral("kmail"); choice.label = /*: @option */ QCoreApplication::translate("Test11", "KMail"); valuesEmailClient.append( choice ); } - mEmailClientItem = new MyPrefs::ItemEnum( currentGroup(), QLatin1String( "EmailClient" ), mEmailClient, valuesEmailClient, kmail ); + mEmailClientItem = new MyPrefs::ItemEnum( currentGroup(), QStringLiteral( "EmailClient" ), mEmailClient, valuesEmailClient, kmail ); mEmailClientItem->setLabel( /*: @label */ QCoreApplication::translate("Test11", "Email client") ); mEmailClientItem->setWhatsThis( /*: @info:whatsthis */ QCoreApplication::translate("Test11", "<para>How to send email when an email alarm is triggered.<list><item>KMail: The email is sent automatically via <application>KMail</application>. <application>KMail</application> is started first if necessary.</item><item>Sendmail: The email is sent automatically. This option will only work if your system is configured to use <application>sendmail</application> or a sendmail compatible mail transport agent.</item></list></para>") ); - addItem( mEmailClientItem, QLatin1String( "EmailClient" ) ); + addItem( mEmailClientItem, QStringLiteral( "EmailClient" ) ); QList<MyPrefs::ItemEnum::Choice> valuesDefaultReminderUnits; { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("Minutes"); + choice.name = QStringLiteral("Minutes"); valuesDefaultReminderUnits.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("HoursMinutes"); + choice.name = QStringLiteral("HoursMinutes"); choice.label = /*: @option */ QCoreApplication::translate("Test11", "Hours/Minutes"); valuesDefaultReminderUnits.append( choice ); } - mDefaultReminderUnitsItem = new MyPrefs::ItemEnum( currentGroup(), QLatin1String( "RemindUnits" ), mDefaultReminderUnits, valuesDefaultReminderUnits, TimePeriod::HoursMinutes ); + mDefaultReminderUnitsItem = new MyPrefs::ItemEnum( currentGroup(), QStringLiteral( "RemindUnits" ), mDefaultReminderUnits, valuesDefaultReminderUnits, TimePeriod::HoursMinutes ); mDefaultReminderUnitsItem->setLabel( /*: @label */ QCoreApplication::translate("Test11", "Reminder units") ); mDefaultReminderUnitsItem->setToolTip( /*: @info:tooltip */ QCoreApplication::translate("Test11", "Default reminder time units in the alarm edit dialog.") ); mDefaultReminderUnitsItem->setWhatsThis( /*: @info:whatsthis */ QCoreApplication::translate("Test11", "Default reminder time units in the alarm edit dialog.") ); - addItem( mDefaultReminderUnitsItem, QLatin1String( "DefaultReminderUnits" ) ); + addItem( mDefaultReminderUnitsItem, QStringLiteral( "DefaultReminderUnits" ) ); - setCurrentGroup( QLatin1String( "QueueRates" ) ); + setCurrentGroup( QStringLiteral( "QueueRates" ) ); QList< QList<int> > defaultRate; QList< int > defaultRateInit; @@ -150,18 +150,18 @@ Test11::Test11( ) QList<int> defaultqueueRate; - mQueueRateItem[0] = new MyPrefs::ItemIntList( currentGroup(), QLatin1String( "EmptyingRate 0" ), mQueueRate[0], defaultRate[0] ); + mQueueRateItem[0] = new MyPrefs::ItemIntList( currentGroup(), QStringLiteral( "EmptyingRate 0" ), mQueueRate[0], defaultRate[0] ); mQueueRateItem[0]->setLabel( QCoreApplication::translate("Test11", "EmptyingRate queueRate$(QueueIndex)") ); - addItem( mQueueRateItem[0], QLatin1String( "queueRate0" ) ); - mQueueRateItem[1] = new MyPrefs::ItemIntList( currentGroup(), QLatin1String( "EmptyingRate 1" ), mQueueRate[1], defaultqueueRate ); + addItem( mQueueRateItem[0], QStringLiteral( "queueRate0" ) ); + mQueueRateItem[1] = new MyPrefs::ItemIntList( currentGroup(), QStringLiteral( "EmptyingRate 1" ), mQueueRate[1], defaultqueueRate ); mQueueRateItem[1]->setLabel( QCoreApplication::translate("Test11", "EmptyingRate queueRate$(QueueIndex)") ); - addItem( mQueueRateItem[1], QLatin1String( "queueRate1" ) ); - mQueueRateItem[2] = new MyPrefs::ItemIntList( currentGroup(), QLatin1String( "EmptyingRate 2" ), mQueueRate[2], defaultRate[2] ); + addItem( mQueueRateItem[1], QStringLiteral( "queueRate1" ) ); + mQueueRateItem[2] = new MyPrefs::ItemIntList( currentGroup(), QStringLiteral( "EmptyingRate 2" ), mQueueRate[2], defaultRate[2] ); mQueueRateItem[2]->setLabel( QCoreApplication::translate("Test11", "EmptyingRate queueRate$(QueueIndex)") ); - addItem( mQueueRateItem[2], QLatin1String( "queueRate2" ) ); - mShowQueueTunerItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "ShowQueueTuner" ), mShowQueueTuner, false ); + addItem( mQueueRateItem[2], QStringLiteral( "queueRate2" ) ); + mShowQueueTunerItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "ShowQueueTuner" ), mShowQueueTuner, false ); mShowQueueTunerItem->setLabel( QCoreApplication::translate("Test11", "ShowQueueTuner") ); - addItem( mShowQueueTunerItem, QLatin1String( "ShowQueueTuner" ) ); + addItem( mShowQueueTunerItem, QStringLiteral( "ShowQueueTuner" ) ); } bool Test11::defaultAutoSaveValue_helper() const diff --git a/autotests/kconfig_compiler/test11a.cpp.ref b/autotests/kconfig_compiler/test11a.cpp.ref index 91656612..fa486fd3 100644 --- a/autotests/kconfig_compiler/test11a.cpp.ref +++ b/autotests/kconfig_compiler/test11a.cpp.ref @@ -4,128 +4,128 @@ #include "test11a.h" Test11a::Test11a( ) - : MyPrefs( QLatin1String( "korganizerrc" ) ) + : MyPrefs( QStringLiteral( "korganizerrc" ) ) { - setCurrentGroup( QLatin1String( "General" ) ); + setCurrentGroup( QStringLiteral( "General" ) ); - mAutoSaveItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "Auto Save" ), mAutoSave, false ); + mAutoSaveItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "Auto Save" ), mAutoSave, false ); mAutoSaveItem->setLabel( QCoreApplication::translate("Test11a", "Enable automatic saving of calendar") ); mAutoSaveItem->setWhatsThis( QCoreApplication::translate("Test11a", "WhatsThis text for AutoSave option") ); - addItem( mAutoSaveItem, QLatin1String( "AutoSave" ) ); - mAutoSaveIntervalItem = new MyPrefs::ItemInt( currentGroup(), QLatin1String( "Auto Save Interval" ), mAutoSaveInterval, 10 ); + addItem( mAutoSaveItem, QStringLiteral( "AutoSave" ) ); + mAutoSaveIntervalItem = new MyPrefs::ItemInt( currentGroup(), QStringLiteral( "Auto Save Interval" ), mAutoSaveInterval, 10 ); mAutoSaveIntervalItem->setLabel( QCoreApplication::translate("Test11a", "Auto Save Interval") ); - addItem( mAutoSaveIntervalItem, QLatin1String( "AutoSaveInterval" ) ); - mConfirmItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "Confirm Deletes" ), mConfirm, true ); + addItem( mAutoSaveIntervalItem, QStringLiteral( "AutoSaveInterval" ) ); + mConfirmItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "Confirm Deletes" ), mConfirm, true ); mConfirmItem->setLabel( QCoreApplication::translate("Test11a", "Confirm deletes") ); - addItem( mConfirmItem, QLatin1String( "Confirm" ) ); - mArchiveFileItem = new MyPrefs::ItemString( currentGroup(), QLatin1String( "Archive File" ), mArchiveFile ); + addItem( mConfirmItem, QStringLiteral( "Confirm" ) ); + mArchiveFileItem = new MyPrefs::ItemString( currentGroup(), QStringLiteral( "Archive File" ), mArchiveFile ); mArchiveFileItem->setLabel( QCoreApplication::translate("Test11a", "Archive File") ); - addItem( mArchiveFileItem, QLatin1String( "ArchiveFile" ) ); + addItem( mArchiveFileItem, QStringLiteral( "ArchiveFile" ) ); QList<MyPrefs::ItemEnum::Choice> valuesDestination; { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("standardDestination"); + choice.name = QStringLiteral("standardDestination"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("askDestination"); + choice.name = QStringLiteral("askDestination"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("argl1"); + choice.name = QStringLiteral("argl1"); choice.label = QCoreApplication::translate("Test11a", "Argl1 Label"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("argl2"); + choice.name = QStringLiteral("argl2"); choice.whatsThis = QCoreApplication::translate("Test11a", "Argl2 Whatsthis"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("argl3"); + choice.name = QStringLiteral("argl3"); choice.label = QCoreApplication::translate("Test11a", "Argl3 Label"); choice.whatsThis = QCoreApplication::translate("Test11a", "Argl3 Whatsthis"); valuesDestination.append( choice ); } - mDestinationItem = new MyPrefs::ItemEnum( currentGroup(), QLatin1String( "Destination" ), mDestination, valuesDestination, EnumDestination::standardDestination ); + mDestinationItem = new MyPrefs::ItemEnum( currentGroup(), QStringLiteral( "Destination" ), mDestination, valuesDestination, EnumDestination::standardDestination ); mDestinationItem->setLabel( QCoreApplication::translate("Test11a", "New Events/Todos Should") ); - addItem( mDestinationItem, QLatin1String( "Destination" ) ); + addItem( mDestinationItem, QStringLiteral( "Destination" ) ); - setCurrentGroup( QLatin1String( "Views" ) ); + setCurrentGroup( QStringLiteral( "Views" ) ); - mHourSizeItem = new MyPrefs::ItemInt( currentGroup(), QLatin1String( "Hour Size" ), mHourSize, 10 ); + mHourSizeItem = new MyPrefs::ItemInt( currentGroup(), QStringLiteral( "Hour Size" ), mHourSize, 10 ); mHourSizeItem->setLabel( QCoreApplication::translate("Test11a", "Hour Size") ); - addItem( mHourSizeItem, QLatin1String( "HourSize" ) ); - mSelectionStartsEditorItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); + addItem( mHourSizeItem, QStringLiteral( "HourSize" ) ); + mSelectionStartsEditorItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); mSelectionStartsEditorItem->setLabel( QCoreApplication::translate("Test11a", "Time range selection in agenda view starts event editor") ); - addItem( mSelectionStartsEditorItem, QLatin1String( "SelectionStartsEditor" ) ); + addItem( mSelectionStartsEditorItem, QStringLiteral( "SelectionStartsEditor" ) ); - setCurrentGroup( QLatin1String( "KOrganizer Plugins" ) ); + setCurrentGroup( QStringLiteral( "KOrganizer Plugins" ) ); QStringList defaultSelectedPlugins; defaultSelectedPlugins.append( QString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( QString::fromUtf8( "webexport" ) ); - mSelectedPluginsItem = new MyPrefs::ItemStringList( currentGroup(), QLatin1String( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); + mSelectedPluginsItem = new MyPrefs::ItemStringList( currentGroup(), QStringLiteral( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); mSelectedPluginsItem->setLabel( QCoreApplication::translate("Test11a", "SelectedPlugins") ); - addItem( mSelectedPluginsItem, QLatin1String( "SelectedPlugins" ) ); + addItem( mSelectedPluginsItem, QStringLiteral( "SelectedPlugins" ) ); - setCurrentGroup( QLatin1String( "Colors" ) ); + setCurrentGroup( QStringLiteral( "Colors" ) ); - mHighlightColorItem = new MyPrefs::ItemColor( currentGroup(), QLatin1String( "Highlight Color" ), mHighlightColor, QColor( 100, 100, 255 ) ); + mHighlightColorItem = new MyPrefs::ItemColor( currentGroup(), QStringLiteral( "Highlight Color" ), mHighlightColor, QColor( 100, 100, 255 ) ); mHighlightColorItem->setLabel( QCoreApplication::translate("Test11a", "Highlight color") ); - addItem( mHighlightColorItem, QLatin1String( "HighlightColor" ) ); - mAgendaBgColorItem = new MyPrefs::ItemColor( currentGroup(), QLatin1String( "Agenda Background Color" ), mAgendaBgColor, QColor( 255, 255, 255 ) ); + addItem( mHighlightColorItem, QStringLiteral( "HighlightColor" ) ); + mAgendaBgColorItem = new MyPrefs::ItemColor( currentGroup(), QStringLiteral( "Agenda Background Color" ), mAgendaBgColor, QColor( 255, 255, 255 ) ); mAgendaBgColorItem->setLabel( QCoreApplication::translate("Test11a", "Agenda view background color") ); - addItem( mAgendaBgColorItem, QLatin1String( "AgendaBgColor" ) ); + addItem( mAgendaBgColorItem, QStringLiteral( "AgendaBgColor" ) ); - setCurrentGroup( QLatin1String( "Fonts" ) ); + setCurrentGroup( QStringLiteral( "Fonts" ) ); - mTimeBarFontItem = new MyPrefs::ItemFont( currentGroup(), QLatin1String( "TimeBar Font" ), mTimeBarFont ); + mTimeBarFontItem = new MyPrefs::ItemFont( currentGroup(), QStringLiteral( "TimeBar Font" ), mTimeBarFont ); mTimeBarFontItem->setLabel( QCoreApplication::translate("Test11a", "Time bar") ); - addItem( mTimeBarFontItem, QLatin1String( "TimeBarFont" ) ); + addItem( mTimeBarFontItem, QStringLiteral( "TimeBarFont" ) ); - setCurrentGroup( QLatin1String( "Email" ) ); + setCurrentGroup( QStringLiteral( "Email" ) ); QList<MyPrefs::ItemEnum::Choice> valuesEmailClient; { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("sendmail"); + choice.name = QStringLiteral("sendmail"); choice.label = /*: @option */ QCoreApplication::translate("Test11a", "Sendmail"); valuesEmailClient.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("kmail"); + choice.name = QStringLiteral("kmail"); choice.label = /*: @option */ QCoreApplication::translate("Test11a", "KMail"); valuesEmailClient.append( choice ); } - mEmailClientItem = new MyPrefs::ItemEnum( currentGroup(), QLatin1String( "EmailClient" ), mEmailClient, valuesEmailClient, kmail ); + mEmailClientItem = new MyPrefs::ItemEnum( currentGroup(), QStringLiteral( "EmailClient" ), mEmailClient, valuesEmailClient, kmail ); mEmailClientItem->setLabel( /*: @label */ QCoreApplication::translate("Test11a", "Email client") ); mEmailClientItem->setWhatsThis( /*: @info:whatsthis */ QCoreApplication::translate("Test11a", "<para>How to send email when an email alarm is triggered.<list><item>KMail: The email is sent automatically via <application>KMail</application>. <application>KMail</application> is started first if necessary.</item><item>Sendmail: The email is sent automatically. This option will only work if your system is configured to use <application>sendmail</application> or a sendmail compatible mail transport agent.</item></list></para>") ); - addItem( mEmailClientItem, QLatin1String( "EmailClient" ) ); + addItem( mEmailClientItem, QStringLiteral( "EmailClient" ) ); QList<MyPrefs::ItemEnum::Choice> valuesDefaultReminderUnits; { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("Minutes"); + choice.name = QStringLiteral("Minutes"); valuesDefaultReminderUnits.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("HoursMinutes"); + choice.name = QStringLiteral("HoursMinutes"); choice.label = /*: @option */ QCoreApplication::translate("Test11a", "Hours/Minutes"); valuesDefaultReminderUnits.append( choice ); } - mDefaultReminderUnitsItem = new MyPrefs::ItemEnum( currentGroup(), QLatin1String( "RemindUnits" ), mDefaultReminderUnits, valuesDefaultReminderUnits, TimePeriod::HoursMinutes ); + mDefaultReminderUnitsItem = new MyPrefs::ItemEnum( currentGroup(), QStringLiteral( "RemindUnits" ), mDefaultReminderUnits, valuesDefaultReminderUnits, TimePeriod::HoursMinutes ); mDefaultReminderUnitsItem->setLabel( /*: @label */ QCoreApplication::translate("Test11a", "Reminder units") ); mDefaultReminderUnitsItem->setWhatsThis( /*: @info:whatsthis */ QCoreApplication::translate("Test11a", "Default reminder time units in the alarm edit dialog.") ); - addItem( mDefaultReminderUnitsItem, QLatin1String( "DefaultReminderUnits" ) ); + addItem( mDefaultReminderUnitsItem, QStringLiteral( "DefaultReminderUnits" ) ); - setCurrentGroup( QLatin1String( "QueueRates" ) ); + setCurrentGroup( QStringLiteral( "QueueRates" ) ); QList< QList<int> > defaultRate; QList< int > defaultRateInit; @@ -149,18 +149,18 @@ Test11a::Test11a( ) QList<int> defaultqueueRate; - mQueueRateItem[0] = new MyPrefs::ItemIntList( currentGroup(), QLatin1String( "EmptyingRate 0" ), mQueueRate[0], defaultRate[0] ); + mQueueRateItem[0] = new MyPrefs::ItemIntList( currentGroup(), QStringLiteral( "EmptyingRate 0" ), mQueueRate[0], defaultRate[0] ); mQueueRateItem[0]->setLabel( QCoreApplication::translate("Test11a", "EmptyingRate queueRate$(QueueIndex)") ); - addItem( mQueueRateItem[0], QLatin1String( "queueRate0" ) ); - mQueueRateItem[1] = new MyPrefs::ItemIntList( currentGroup(), QLatin1String( "EmptyingRate 1" ), mQueueRate[1], defaultqueueRate ); + addItem( mQueueRateItem[0], QStringLiteral( "queueRate0" ) ); + mQueueRateItem[1] = new MyPrefs::ItemIntList( currentGroup(), QStringLiteral( "EmptyingRate 1" ), mQueueRate[1], defaultqueueRate ); mQueueRateItem[1]->setLabel( QCoreApplication::translate("Test11a", "EmptyingRate queueRate$(QueueIndex)") ); - addItem( mQueueRateItem[1], QLatin1String( "queueRate1" ) ); - mQueueRateItem[2] = new MyPrefs::ItemIntList( currentGroup(), QLatin1String( "EmptyingRate 2" ), mQueueRate[2], defaultRate[2] ); + addItem( mQueueRateItem[1], QStringLiteral( "queueRate1" ) ); + mQueueRateItem[2] = new MyPrefs::ItemIntList( currentGroup(), QStringLiteral( "EmptyingRate 2" ), mQueueRate[2], defaultRate[2] ); mQueueRateItem[2]->setLabel( QCoreApplication::translate("Test11a", "EmptyingRate queueRate$(QueueIndex)") ); - addItem( mQueueRateItem[2], QLatin1String( "queueRate2" ) ); - mShowQueueTunerItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "ShowQueueTuner" ), mShowQueueTuner, false ); + addItem( mQueueRateItem[2], QStringLiteral( "queueRate2" ) ); + mShowQueueTunerItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "ShowQueueTuner" ), mShowQueueTuner, false ); mShowQueueTunerItem->setLabel( QCoreApplication::translate("Test11a", "ShowQueueTuner") ); - addItem( mShowQueueTunerItem, QLatin1String( "ShowQueueTuner" ) ); + addItem( mShowQueueTunerItem, QStringLiteral( "ShowQueueTuner" ) ); } int Test11a::defaultDestinationValue_helper() const diff --git a/autotests/kconfig_compiler/test12.cpp.ref b/autotests/kconfig_compiler/test12.cpp.ref index e1cd01a6..da6670a0 100644 --- a/autotests/kconfig_compiler/test12.cpp.ref +++ b/autotests/kconfig_compiler/test12.cpp.ref @@ -4,16 +4,16 @@ #include "test12.h" Test12::Test12( ) - : KConfigSkeleton( QLatin1String( "muondatasourcesrc" ) ) + : KConfigSkeleton( QStringLiteral( "muondatasourcesrc" ) ) { - setCurrentGroup( QLatin1String( "muon" ) ); + setCurrentGroup( QStringLiteral( "muon" ) ); QList<QUrl> defaultRnRSource; defaultRnRSource.append( QUrl::fromUserInput(QString::fromUtf8( "http://kde.org" ) ) ); KConfigSkeleton::ItemUrlList *itemRnRSource; - itemRnRSource = new KConfigSkeleton::ItemUrlList( currentGroup(), QLatin1String( "RnRSource" ), mRnRSource, defaultRnRSource ); - addItem( itemRnRSource, QLatin1String( "RnRSource" ) ); + itemRnRSource = new KConfigSkeleton::ItemUrlList( currentGroup(), QStringLiteral( "RnRSource" ), mRnRSource, defaultRnRSource ); + addItem( itemRnRSource, QStringLiteral( "RnRSource" ) ); } Test12::~Test12() diff --git a/autotests/kconfig_compiler/test13.cpp.ref b/autotests/kconfig_compiler/test13.cpp.ref index 4eac1034..3beea1d0 100644 --- a/autotests/kconfig_compiler/test13.cpp.ref +++ b/autotests/kconfig_compiler/test13.cpp.ref @@ -4,18 +4,18 @@ #include "test13.h" Test13::Test13( ) - : KConfigSkeleton( QLatin1String( "muondatasourcesrc" ) ) + : KConfigSkeleton( QStringLiteral( "muondatasourcesrc" ) ) { KConfigCompilerSignallingItem::NotifyFunction notifyFunction = static_cast<KConfigCompilerSignallingItem::NotifyFunction>(&Test13::itemChanged); - setCurrentGroup( QLatin1String( "kamoso" ) ); + setCurrentGroup( QStringLiteral( "kamoso" ) ); KConfigSkeleton::ItemUrl *itemPicturesDir; - itemPicturesDir = new KConfigSkeleton::ItemUrl( currentGroup(), QLatin1String( "picturesDir" ), mPicturesDir ); - addItem( itemPicturesDir, QLatin1String( "picturesDir" ) ); + itemPicturesDir = new KConfigSkeleton::ItemUrl( currentGroup(), QStringLiteral( "picturesDir" ), mPicturesDir ); + addItem( itemPicturesDir, QStringLiteral( "picturesDir" ) ); KConfigCompilerSignallingItem *itemBrightness; - itemBrightness = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemDouble( currentGroup(), QLatin1String( "brightness" ), mBrightness ), this, notifyFunction, signalBrightnessChanged); - addItem( itemBrightness, QLatin1String( "brightness" ) ); + itemBrightness = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemDouble( currentGroup(), QStringLiteral( "brightness" ), mBrightness ), this, notifyFunction, signalBrightnessChanged); + addItem( itemBrightness, QStringLiteral( "brightness" ) ); } Test13::~Test13() diff --git a/autotests/kconfig_compiler/test2.cpp.ref b/autotests/kconfig_compiler/test2.cpp.ref index e99eb7c7..53b0935f 100644 --- a/autotests/kconfig_compiler/test2.cpp.ref +++ b/autotests/kconfig_compiler/test2.cpp.ref @@ -4,90 +4,90 @@ #include "test2.h" Test2::Test2( ) - : MyPrefs( QLatin1String( "korganizerrc" ) ) + : MyPrefs( QStringLiteral( "korganizerrc" ) ) { - setCurrentGroup( QLatin1String( "General" ) ); + setCurrentGroup( QStringLiteral( "General" ) ); - mAutoSaveItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "Auto Save" ), mAutoSave, false ); + mAutoSaveItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "Auto Save" ), mAutoSave, false ); mAutoSaveItem->setLabel( QCoreApplication::translate("Test2", "Enable automatic saving of calendar") ); mAutoSaveItem->setWhatsThis( QCoreApplication::translate("Test2", "WhatsThis text for AutoSave option") ); - addItem( mAutoSaveItem, QLatin1String( "AutoSave" ) ); - mAutoSaveIntervalItem = new MyPrefs::ItemInt( currentGroup(), QLatin1String( "Auto Save Interval" ), mAutoSaveInterval, 10 ); + addItem( mAutoSaveItem, QStringLiteral( "AutoSave" ) ); + mAutoSaveIntervalItem = new MyPrefs::ItemInt( currentGroup(), QStringLiteral( "Auto Save Interval" ), mAutoSaveInterval, 10 ); mAutoSaveIntervalItem->setLabel( QCoreApplication::translate("Test2", "Auto Save Interval") ); - addItem( mAutoSaveIntervalItem, QLatin1String( "AutoSaveInterval" ) ); - mConfirmItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "Confirm Deletes" ), mConfirm, true ); + addItem( mAutoSaveIntervalItem, QStringLiteral( "AutoSaveInterval" ) ); + mConfirmItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "Confirm Deletes" ), mConfirm, true ); mConfirmItem->setLabel( QCoreApplication::translate("Test2", "Confirm deletes") ); - addItem( mConfirmItem, QLatin1String( "Confirm" ) ); - mArchiveFileItem = new MyPrefs::ItemString( currentGroup(), QLatin1String( "Archive File" ), mArchiveFile ); + addItem( mConfirmItem, QStringLiteral( "Confirm" ) ); + mArchiveFileItem = new MyPrefs::ItemString( currentGroup(), QStringLiteral( "Archive File" ), mArchiveFile ); mArchiveFileItem->setLabel( QCoreApplication::translate("Test2", "Archive File") ); - addItem( mArchiveFileItem, QLatin1String( "ArchiveFile" ) ); + addItem( mArchiveFileItem, QStringLiteral( "ArchiveFile" ) ); QList<MyPrefs::ItemEnum::Choice> valuesDestination; { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("standardDestination"); + choice.name = QStringLiteral("standardDestination"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("askDestination"); + choice.name = QStringLiteral("askDestination"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("argl1"); + choice.name = QStringLiteral("argl1"); choice.label = QCoreApplication::translate("Test2", "Argl1 Label"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("argl2"); + choice.name = QStringLiteral("argl2"); choice.whatsThis = QCoreApplication::translate("Test2", "Argl2 Whatsthis"); valuesDestination.append( choice ); } { MyPrefs::ItemEnum::Choice choice; - choice.name = QLatin1String("argl3"); + choice.name = QStringLiteral("argl3"); choice.label = QCoreApplication::translate("Test2", "Argl3 Label"); choice.whatsThis = QCoreApplication::translate("Test2", "Argl3 Whatsthis"); valuesDestination.append( choice ); } - mDestinationItem = new MyPrefs::ItemEnum( currentGroup(), QLatin1String( "Destination" ), mDestination, valuesDestination, standardDestination ); + mDestinationItem = new MyPrefs::ItemEnum( currentGroup(), QStringLiteral( "Destination" ), mDestination, valuesDestination, standardDestination ); mDestinationItem->setLabel( QCoreApplication::translate("Test2", "New Events/Todos Should") ); - addItem( mDestinationItem, QLatin1String( "Destination" ) ); + addItem( mDestinationItem, QStringLiteral( "Destination" ) ); - setCurrentGroup( QLatin1String( "Views" ) ); + setCurrentGroup( QStringLiteral( "Views" ) ); - mHourSizeItem = new MyPrefs::ItemInt( currentGroup(), QLatin1String( "Hour Size" ), mHourSize, 10 ); + mHourSizeItem = new MyPrefs::ItemInt( currentGroup(), QStringLiteral( "Hour Size" ), mHourSize, 10 ); mHourSizeItem->setLabel( QCoreApplication::translate("Test2", "Hour Size") ); - addItem( mHourSizeItem, QLatin1String( "HourSize" ) ); - mSelectionStartsEditorItem = new MyPrefs::ItemBool( currentGroup(), QLatin1String( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); + addItem( mHourSizeItem, QStringLiteral( "HourSize" ) ); + mSelectionStartsEditorItem = new MyPrefs::ItemBool( currentGroup(), QStringLiteral( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); mSelectionStartsEditorItem->setLabel( QCoreApplication::translate("Test2", "Time range selection in agenda view starts event editor") ); - addItem( mSelectionStartsEditorItem, QLatin1String( "SelectionStartsEditor" ) ); + addItem( mSelectionStartsEditorItem, QStringLiteral( "SelectionStartsEditor" ) ); - setCurrentGroup( QLatin1String( "KOrganizer Plugins" ) ); + setCurrentGroup( QStringLiteral( "KOrganizer Plugins" ) ); QStringList defaultSelectedPlugins; defaultSelectedPlugins.append( QString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( QString::fromUtf8( "webexport" ) ); - mSelectedPluginsItem = new MyPrefs::ItemStringList( currentGroup(), QLatin1String( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); + mSelectedPluginsItem = new MyPrefs::ItemStringList( currentGroup(), QStringLiteral( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); mSelectedPluginsItem->setLabel( QCoreApplication::translate("Test2", "SelectedPlugins") ); - addItem( mSelectedPluginsItem, QLatin1String( "SelectedPlugins" ) ); + addItem( mSelectedPluginsItem, QStringLiteral( "SelectedPlugins" ) ); - setCurrentGroup( QLatin1String( "Colors" ) ); + setCurrentGroup( QStringLiteral( "Colors" ) ); - mHighlightColorItem = new MyPrefs::ItemColor( currentGroup(), QLatin1String( "Highlight Color" ), mHighlightColor, QColor( 100, 100, 255 ) ); + mHighlightColorItem = new MyPrefs::ItemColor( currentGroup(), QStringLiteral( "Highlight Color" ), mHighlightColor, QColor( 100, 100, 255 ) ); mHighlightColorItem->setLabel( QCoreApplication::translate("Test2", "Highlight color") ); - addItem( mHighlightColorItem, QLatin1String( "HighlightColor" ) ); - mAgendaBgColorItem = new MyPrefs::ItemColor( currentGroup(), QLatin1String( "Agenda Background Color" ), mAgendaBgColor, QColor( 255, 255, 255 ) ); + addItem( mHighlightColorItem, QStringLiteral( "HighlightColor" ) ); + mAgendaBgColorItem = new MyPrefs::ItemColor( currentGroup(), QStringLiteral( "Agenda Background Color" ), mAgendaBgColor, QColor( 255, 255, 255 ) ); mAgendaBgColorItem->setLabel( QCoreApplication::translate("Test2", "Agenda view background color") ); - addItem( mAgendaBgColorItem, QLatin1String( "AgendaBgColor" ) ); + addItem( mAgendaBgColorItem, QStringLiteral( "AgendaBgColor" ) ); - setCurrentGroup( QLatin1String( "Fonts" ) ); + setCurrentGroup( QStringLiteral( "Fonts" ) ); - mTimeBarFontItem = new MyPrefs::ItemFont( currentGroup(), QLatin1String( "TimeBar Font" ), mTimeBarFont ); + mTimeBarFontItem = new MyPrefs::ItemFont( currentGroup(), QStringLiteral( "TimeBar Font" ), mTimeBarFont ); mTimeBarFontItem->setLabel( QCoreApplication::translate("Test2", "Time bar") ); - addItem( mTimeBarFontItem, QLatin1String( "TimeBarFont" ) ); + addItem( mTimeBarFontItem, QStringLiteral( "TimeBarFont" ) ); } Test2::~Test2() diff --git a/autotests/kconfig_compiler/test3.cpp.ref b/autotests/kconfig_compiler/test3.cpp.ref index 1ac95252..aa9fb919 100644 --- a/autotests/kconfig_compiler/test3.cpp.ref +++ b/autotests/kconfig_compiler/test3.cpp.ref @@ -6,21 +6,21 @@ using namespace TestNameSpace; Test3::Test3( ) - : KConfigSkeleton( QLatin1String( "test3rc" ) ) + : KConfigSkeleton( QStringLiteral( "test3rc" ) ) { - setCurrentGroup( QLatin1String( "General" ) ); + setCurrentGroup( QStringLiteral( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "Auto Save" ), mAutoSave, false ); - addItem( mAutoSaveItem, QLatin1String( "AutoSave" ) ); + mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "Auto Save" ), mAutoSave, false ); + addItem( mAutoSaveItem, QStringLiteral( "AutoSave" ) ); - setCurrentGroup( QLatin1String( "Blah" ) ); + setCurrentGroup( QStringLiteral( "Blah" ) ); - mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Blubb" ), mBlubb, 10 ); - addItem( mBlubbItem, QLatin1String( "Blubb" ) ); - mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "BlahBlah" ), mBlahBlah, QLatin1String( "a string" ) ); - addItem( mBlahBlahItem, QLatin1String( "BlahBlah" ) ); - mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), QLatin1String( "MyPassword" ), mMyPassword ); - addItem( mMyPasswordItem, QLatin1String( "MyPassword" ) ); + mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Blubb" ), mBlubb, 10 ); + addItem( mBlubbItem, QStringLiteral( "Blubb" ) ); + mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "BlahBlah" ), mBlahBlah, QStringLiteral( "a string" ) ); + addItem( mBlahBlahItem, QStringLiteral( "BlahBlah" ) ); + mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), QStringLiteral( "MyPassword" ), mMyPassword ); + addItem( mMyPasswordItem, QStringLiteral( "MyPassword" ) ); } Test3::~Test3() diff --git a/autotests/kconfig_compiler/test3a.cpp.ref b/autotests/kconfig_compiler/test3a.cpp.ref index dc721718..4ff193db 100644 --- a/autotests/kconfig_compiler/test3a.cpp.ref +++ b/autotests/kconfig_compiler/test3a.cpp.ref @@ -6,21 +6,21 @@ using namespace TestNameSpace::InnerNameSpace; Test3a::Test3a( ) - : KConfigSkeleton( QLatin1String( "test3arc" ) ) + : KConfigSkeleton( QStringLiteral( "test3arc" ) ) { - setCurrentGroup( QLatin1String( "General" ) ); + setCurrentGroup( QStringLiteral( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "Auto Save" ), mAutoSave, false ); - addItem( mAutoSaveItem, QLatin1String( "AutoSave" ) ); + mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "Auto Save" ), mAutoSave, false ); + addItem( mAutoSaveItem, QStringLiteral( "AutoSave" ) ); - setCurrentGroup( QLatin1String( "Blah" ) ); + setCurrentGroup( QStringLiteral( "Blah" ) ); - mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Blubb" ), mBlubb, 10 ); - addItem( mBlubbItem, QLatin1String( "Blubb" ) ); - mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "BlahBlah" ), mBlahBlah, QLatin1String( "a string" ) ); - addItem( mBlahBlahItem, QLatin1String( "BlahBlah" ) ); - mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), QLatin1String( "MyPassword" ), mMyPassword ); - addItem( mMyPasswordItem, QLatin1String( "MyPassword" ) ); + mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Blubb" ), mBlubb, 10 ); + addItem( mBlubbItem, QStringLiteral( "Blubb" ) ); + mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "BlahBlah" ), mBlahBlah, QStringLiteral( "a string" ) ); + addItem( mBlahBlahItem, QStringLiteral( "BlahBlah" ) ); + mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), QStringLiteral( "MyPassword" ), mMyPassword ); + addItem( mMyPasswordItem, QStringLiteral( "MyPassword" ) ); } Test3a::~Test3a() diff --git a/autotests/kconfig_compiler/test4.cpp.ref b/autotests/kconfig_compiler/test4.cpp.ref index 2199c166..f6b4486f 100644 --- a/autotests/kconfig_compiler/test4.cpp.ref +++ b/autotests/kconfig_compiler/test4.cpp.ref @@ -27,148 +27,148 @@ Test4 *Test4::self() const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" }; Test4::Test4( ) - : KConfigSkeleton( QLatin1String( "test4rc" ) ) + : KConfigSkeleton( QStringLiteral( "test4rc" ) ) { Q_ASSERT(!s_globalTest4()->q); s_globalTest4()->q = this; - setCurrentGroup( QLatin1String( "Foo" ) ); + setCurrentGroup( QStringLiteral( "Foo" ) ); QColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; KConfigSkeleton::ItemColor *itemColor[4]; - itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "color #0" ), mColor[0], defaultColor[0] ); - addItem( itemColor[0], QLatin1String( "Color0" ) ); - itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "color #1" ), mColor[1], defaultColor[1] ); - addItem( itemColor[1], QLatin1String( "Color1" ) ); - itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "color #2" ), mColor[2], defaultColor[2] ); - addItem( itemColor[2], QLatin1String( "Color2" ) ); - itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "color #3" ), mColor[3], defaultColor[3] ); - addItem( itemColor[3], QLatin1String( "Color3" ) ); + itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #0" ), mColor[0], defaultColor[0] ); + addItem( itemColor[0], QStringLiteral( "Color0" ) ); + itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #1" ), mColor[1], defaultColor[1] ); + addItem( itemColor[1], QStringLiteral( "Color1" ) ); + itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #2" ), mColor[2], defaultColor[2] ); + addItem( itemColor[2], QStringLiteral( "Color2" ) ); + itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #3" ), mColor[3], defaultColor[3] ); + addItem( itemColor[3], QStringLiteral( "Color3" ) ); QList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("Encrypt"); + choice.name = QStringLiteral("Encrypt"); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("Decrypt"); + choice.name = QStringLiteral("Decrypt"); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("CrashNBurn"); + choice.name = QStringLiteral("CrashNBurn"); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("PumpNDump"); + choice.name = QStringLiteral("PumpNDump"); valuesMouseAction.append( choice ); } KConfigSkeleton::ItemEnum *itemMouseAction[3]; - itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt ); - addItem( itemMouseAction[0], QLatin1String( "MouseActionright" ) ); - itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt ); - addItem( itemMouseAction[1], QLatin1String( "MouseActionmid" ) ); - itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump ); - addItem( itemMouseAction[2], QLatin1String( "MouseActionleft" ) ); + itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), QStringLiteral( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt ); + addItem( itemMouseAction[0], QStringLiteral( "MouseActionright" ) ); + itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), QStringLiteral( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt ); + addItem( itemMouseAction[1], QStringLiteral( "MouseActionmid" ) ); + itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), QStringLiteral( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump ); + addItem( itemMouseAction[2], QStringLiteral( "MouseActionleft" ) ); KConfigSkeleton::ItemColor *itemGrayColor[11]; - itemGrayColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #0" ), mGrayColor[0], + itemGrayColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #0" ), mGrayColor[0], QColor::fromRgbF(0 / 10.0, 0 / 10.0, 0 / 10.0) ); - addItem( itemGrayColor[0], QLatin1String( "GrayColor0" ) ); - itemGrayColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #1" ), mGrayColor[1], + addItem( itemGrayColor[0], QStringLiteral( "GrayColor0" ) ); + itemGrayColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #1" ), mGrayColor[1], QColor::fromRgbF(1 / 10.0, 1 / 10.0, 1 / 10.0) ); - addItem( itemGrayColor[1], QLatin1String( "GrayColor1" ) ); - itemGrayColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #2" ), mGrayColor[2], + addItem( itemGrayColor[1], QStringLiteral( "GrayColor1" ) ); + itemGrayColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #2" ), mGrayColor[2], QColor::fromRgbF(2 / 10.0, 2 / 10.0, 2 / 10.0) ); - addItem( itemGrayColor[2], QLatin1String( "GrayColor2" ) ); - itemGrayColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #3" ), mGrayColor[3], + addItem( itemGrayColor[2], QStringLiteral( "GrayColor2" ) ); + itemGrayColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #3" ), mGrayColor[3], QColor::fromRgbF(3 / 10.0, 3 / 10.0, 3 / 10.0) ); - addItem( itemGrayColor[3], QLatin1String( "GrayColor3" ) ); - itemGrayColor[4] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #4" ), mGrayColor[4], + addItem( itemGrayColor[3], QStringLiteral( "GrayColor3" ) ); + itemGrayColor[4] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #4" ), mGrayColor[4], QColor::fromRgbF(4 / 10.0, 4 / 10.0, 4 / 10.0) ); - addItem( itemGrayColor[4], QLatin1String( "GrayColor4" ) ); - itemGrayColor[5] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #5" ), mGrayColor[5], + addItem( itemGrayColor[4], QStringLiteral( "GrayColor4" ) ); + itemGrayColor[5] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #5" ), mGrayColor[5], QColor::fromRgbF(5 / 10.0, 5 / 10.0, 5 / 10.0) ); - addItem( itemGrayColor[5], QLatin1String( "GrayColor5" ) ); - itemGrayColor[6] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #6" ), mGrayColor[6], + addItem( itemGrayColor[5], QStringLiteral( "GrayColor5" ) ); + itemGrayColor[6] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #6" ), mGrayColor[6], QColor::fromRgbF(6 / 10.0, 6 / 10.0, 6 / 10.0) ); - addItem( itemGrayColor[6], QLatin1String( "GrayColor6" ) ); - itemGrayColor[7] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #7" ), mGrayColor[7], + addItem( itemGrayColor[6], QStringLiteral( "GrayColor6" ) ); + itemGrayColor[7] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #7" ), mGrayColor[7], QColor::fromRgbF(7 / 10.0, 7 / 10.0, 7 / 10.0) ); - addItem( itemGrayColor[7], QLatin1String( "GrayColor7" ) ); - itemGrayColor[8] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #8" ), mGrayColor[8], + addItem( itemGrayColor[7], QStringLiteral( "GrayColor7" ) ); + itemGrayColor[8] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #8" ), mGrayColor[8], QColor::fromRgbF(8 / 10.0, 8 / 10.0, 8 / 10.0) ); - addItem( itemGrayColor[8], QLatin1String( "GrayColor8" ) ); - itemGrayColor[9] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #9" ), mGrayColor[9], + addItem( itemGrayColor[8], QStringLiteral( "GrayColor8" ) ); + itemGrayColor[9] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #9" ), mGrayColor[9], QColor::fromRgbF(9 / 10.0, 9 / 10.0, 9 / 10.0) ); - addItem( itemGrayColor[9], QLatin1String( "GrayColor9" ) ); - itemGrayColor[10] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "gray color #10" ), mGrayColor[10], + addItem( itemGrayColor[9], QStringLiteral( "GrayColor9" ) ); + itemGrayColor[10] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "gray color #10" ), mGrayColor[10], QColor::fromRgbF(10 / 10.0, 10 / 10.0, 10 / 10.0) ); - addItem( itemGrayColor[10], QLatin1String( "GrayColor10" ) ); + addItem( itemGrayColor[10], QStringLiteral( "GrayColor10" ) ); KConfigSkeleton::ItemString *itemColorString[11]; - itemColorString[0] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #0" ), mColorString[0], + itemColorString[0] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #0" ), mColorString[0], QString::number(0) ); - addItem( itemColorString[0], QLatin1String( "ColorString0" ) ); - itemColorString[1] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #1" ), mColorString[1], + addItem( itemColorString[0], QStringLiteral( "ColorString0" ) ); + itemColorString[1] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #1" ), mColorString[1], QString::number(1) ); - addItem( itemColorString[1], QLatin1String( "ColorString1" ) ); - itemColorString[2] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #2" ), mColorString[2], + addItem( itemColorString[1], QStringLiteral( "ColorString1" ) ); + itemColorString[2] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #2" ), mColorString[2], QString::number(2) ); - addItem( itemColorString[2], QLatin1String( "ColorString2" ) ); - itemColorString[3] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #3" ), mColorString[3], + addItem( itemColorString[2], QStringLiteral( "ColorString2" ) ); + itemColorString[3] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #3" ), mColorString[3], QString::number(3) ); - addItem( itemColorString[3], QLatin1String( "ColorString3" ) ); - itemColorString[4] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #4" ), mColorString[4], + addItem( itemColorString[3], QStringLiteral( "ColorString3" ) ); + itemColorString[4] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #4" ), mColorString[4], QString::number(4) ); - addItem( itemColorString[4], QLatin1String( "ColorString4" ) ); - itemColorString[5] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #5" ), mColorString[5], + addItem( itemColorString[4], QStringLiteral( "ColorString4" ) ); + itemColorString[5] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #5" ), mColorString[5], QString::number(5) ); - addItem( itemColorString[5], QLatin1String( "ColorString5" ) ); - itemColorString[6] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #6" ), mColorString[6], + addItem( itemColorString[5], QStringLiteral( "ColorString5" ) ); + itemColorString[6] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #6" ), mColorString[6], QString::number(6) ); - addItem( itemColorString[6], QLatin1String( "ColorString6" ) ); - itemColorString[7] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #7" ), mColorString[7], + addItem( itemColorString[6], QStringLiteral( "ColorString6" ) ); + itemColorString[7] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #7" ), mColorString[7], QString::number(7) ); - addItem( itemColorString[7], QLatin1String( "ColorString7" ) ); - itemColorString[8] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #8" ), mColorString[8], + addItem( itemColorString[7], QStringLiteral( "ColorString7" ) ); + itemColorString[8] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #8" ), mColorString[8], QString::number(8) ); - addItem( itemColorString[8], QLatin1String( "ColorString8" ) ); - itemColorString[9] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #9" ), mColorString[9], + addItem( itemColorString[8], QStringLiteral( "ColorString8" ) ); + itemColorString[9] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #9" ), mColorString[9], QString::number(9) ); - addItem( itemColorString[9], QLatin1String( "ColorString9" ) ); - itemColorString[10] = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "color string #10" ), mColorString[10], + addItem( itemColorString[9], QStringLiteral( "ColorString9" ) ); + itemColorString[10] = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "color string #10" ), mColorString[10], QString::number(10) ); - addItem( itemColorString[10], QLatin1String( "ColorString10" ) ); + addItem( itemColorString[10], QStringLiteral( "ColorString10" ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "foo bar" ), mFooBar ); - addItem( itemFooBar, QLatin1String( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "foo bar" ), mFooBar ); + addItem( itemFooBar, QStringLiteral( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, QLatin1String( "Age" ) ); + addItem( itemAge, QStringLiteral( "Age" ) ); } Test4::~Test4() diff --git a/autotests/kconfig_compiler/test5.cpp.ref b/autotests/kconfig_compiler/test5.cpp.ref index 323c1eee..fefe8e8c 100644 --- a/autotests/kconfig_compiler/test5.cpp.ref +++ b/autotests/kconfig_compiler/test5.cpp.ref @@ -27,58 +27,58 @@ Test5 *Test5::self() const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" }; Test5::Test5( ) - : KConfigSkeleton( QLatin1String( "test4rc" ) ) + : KConfigSkeleton( QStringLiteral( "test4rc" ) ) { Q_ASSERT(!s_globalTest5()->q); s_globalTest5()->q = this; - setCurrentGroup( QLatin1String( "Foo" ) ); + setCurrentGroup( QStringLiteral( "Foo" ) ); QColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; KConfigSkeleton::ItemColor *itemColor[4]; - itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "color #0" ), mColor[0], defaultColor[0] ); - addItem( itemColor[0], QLatin1String( "Color0" ) ); - itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "color #1" ), mColor[1], defaultColor[1] ); - addItem( itemColor[1], QLatin1String( "Color1" ) ); - itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "color #2" ), mColor[2], defaultColor[2] ); - addItem( itemColor[2], QLatin1String( "Color2" ) ); - itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "color #3" ), mColor[3], defaultColor[3] ); - addItem( itemColor[3], QLatin1String( "Color3" ) ); + itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #0" ), mColor[0], defaultColor[0] ); + addItem( itemColor[0], QStringLiteral( "Color0" ) ); + itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #1" ), mColor[1], defaultColor[1] ); + addItem( itemColor[1], QStringLiteral( "Color1" ) ); + itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #2" ), mColor[2], defaultColor[2] ); + addItem( itemColor[2], QStringLiteral( "Color2" ) ); + itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #3" ), mColor[3], defaultColor[3] ); + addItem( itemColor[3], QStringLiteral( "Color3" ) ); QList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("Encrypt"); + choice.name = QStringLiteral("Encrypt"); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("Decrypt"); + choice.name = QStringLiteral("Decrypt"); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("CrashNBurn"); + choice.name = QStringLiteral("CrashNBurn"); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("PumpNDump"); + choice.name = QStringLiteral("PumpNDump"); valuesMouseAction.append( choice ); } KConfigSkeleton::ItemEnum *itemMouseAction[3]; - itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt ); - addItem( itemMouseAction[0], QLatin1String( "MouseActionright" ) ); - itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt ); - addItem( itemMouseAction[1], QLatin1String( "MouseActionmid" ) ); - itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump ); - addItem( itemMouseAction[2], QLatin1String( "MouseActionleft" ) ); + itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), QStringLiteral( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt ); + addItem( itemMouseAction[0], QStringLiteral( "MouseActionright" ) ); + itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), QStringLiteral( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt ); + addItem( itemMouseAction[1], QStringLiteral( "MouseActionmid" ) ); + itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), QStringLiteral( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump ); + addItem( itemMouseAction[2], QStringLiteral( "MouseActionleft" ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "foo bar" ), mFooBar ); - addItem( itemFooBar, QLatin1String( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "foo bar" ), mFooBar ); + addItem( itemFooBar, QStringLiteral( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, QLatin1String( "Age" ) ); + addItem( itemAge, QStringLiteral( "Age" ) ); } Test5::~Test5() diff --git a/autotests/kconfig_compiler/test6.cpp.ref b/autotests/kconfig_compiler/test6.cpp.ref index 629d828b..53f88c73 100644 --- a/autotests/kconfig_compiler/test6.cpp.ref +++ b/autotests/kconfig_compiler/test6.cpp.ref @@ -4,25 +4,25 @@ #include "test6.h" Test6::Test6( const QString & Number ) - : KConfigSkeleton( QLatin1String( "test4rc" ) ) + : KConfigSkeleton( QStringLiteral( "test4rc" ) ) , mParamNumber(Number) { - setCurrentGroup( QLatin1String( "Foo" ) ); + setCurrentGroup( QStringLiteral( "Foo" ) ); KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), QString( QLatin1String( "color #%1" ) ).arg( mParamNumber ), mColor, QColor( "red" ) ); - addItem( itemColor, QLatin1String( "Color" ) ); + itemColor = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #%1" ).arg( mParamNumber ), mColor, QColor( "red" ) ); + addItem( itemColor, QStringLiteral( "Color" ) ); - setCurrentGroup( QString( QLatin1String( "Bar%1" ) ).arg( mParamNumber ) ); + setCurrentGroup( QStringLiteral( "Bar%1" ).arg( mParamNumber ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "foo bar" ), mFooBar ); - addItem( itemFooBar, QLatin1String( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "foo bar" ), mFooBar ); + addItem( itemFooBar, QStringLiteral( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, QLatin1String( "Age" ) ); + addItem( itemAge, QStringLiteral( "Age" ) ); } Test6::~Test6() diff --git a/autotests/kconfig_compiler/test7.cpp.ref b/autotests/kconfig_compiler/test7.cpp.ref index f506b095..2e40848c 100644 --- a/autotests/kconfig_compiler/test7.cpp.ref +++ b/autotests/kconfig_compiler/test7.cpp.ref @@ -4,25 +4,25 @@ #include "test7.h" Test7::Test7( int Number ) - : KConfigSkeleton( QLatin1String( "test7rc" ) ) + : KConfigSkeleton( QStringLiteral( "test7rc" ) ) , mParamNumber(Number) { - setCurrentGroup( QLatin1String( "Foo" ) ); + setCurrentGroup( QStringLiteral( "Foo" ) ); KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), QString( QLatin1String( "color #%1" ) ).arg( mParamNumber ), mColor, QColor( "red" ) ); - addItem( itemColor, QLatin1String( "Color" ) ); + itemColor = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #%1" ).arg( mParamNumber ), mColor, QColor( "red" ) ); + addItem( itemColor, QStringLiteral( "Color" ) ); - setCurrentGroup( QString( QLatin1String( "Bar%1" ) ).arg( mParamNumber ) ); + setCurrentGroup( QStringLiteral( "Bar%1" ).arg( mParamNumber ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "foo bar" ), mFooBar ); - addItem( itemFooBar, QLatin1String( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "foo bar" ), mFooBar ); + addItem( itemFooBar, QStringLiteral( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, QLatin1String( "Age" ) ); + addItem( itemAge, QStringLiteral( "Age" ) ); } Test7::~Test7() diff --git a/autotests/kconfig_compiler/test8a.cpp.ref b/autotests/kconfig_compiler/test8a.cpp.ref index 00d4d02c..3b7d95aa 100644 --- a/autotests/kconfig_compiler/test8a.cpp.ref +++ b/autotests/kconfig_compiler/test8a.cpp.ref @@ -6,14 +6,14 @@ Test8a::Test8a( KSharedConfig::Ptr config ) : KConfigSkeleton( config ) { - setCurrentGroup( QLatin1String( "Group" ) ); + setCurrentGroup( QStringLiteral( "Group" ) ); KConfigSkeleton::ItemFont *itemFont; - itemFont = new KConfigSkeleton::ItemFont( currentGroup(), QLatin1String( "Font" ), mFont, QFont() ); - addItem( itemFont, QLatin1String( "Font" ) ); + itemFont = new KConfigSkeleton::ItemFont( currentGroup(), QStringLiteral( "Font" ), mFont, QFont() ); + addItem( itemFont, QStringLiteral( "Font" ) ); KConfigSkeleton::ItemFont *itemTitleFont; - itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), QLatin1String( "TitleFont" ), mTitleFont, QFont() ); - addItem( itemTitleFont, QLatin1String( "TitleFont" ) ); + itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), QStringLiteral( "TitleFont" ), mTitleFont, QFont() ); + addItem( itemTitleFont, QStringLiteral( "TitleFont" ) ); } Test8a::~Test8a() diff --git a/autotests/kconfig_compiler/test8b.cpp.ref b/autotests/kconfig_compiler/test8b.cpp.ref index 8890815b..5c369a62 100644 --- a/autotests/kconfig_compiler/test8b.cpp.ref +++ b/autotests/kconfig_compiler/test8b.cpp.ref @@ -29,20 +29,20 @@ Test8b::Test8b( ) { Q_ASSERT(!s_globalTest8b()->q); s_globalTest8b()->q = this; - setCurrentGroup( QLatin1String( "Group8b1" ) ); + setCurrentGroup( QStringLiteral( "Group8b1" ) ); Test8a::ItemUInt *itemSomething; - itemSomething = new Test8a::ItemUInt( currentGroup(), QLatin1String( "Something" ), mSomething, 60 ); - addItem( itemSomething, QLatin1String( "Something" ) ); + itemSomething = new Test8a::ItemUInt( currentGroup(), QStringLiteral( "Something" ), mSomething, 60 ); + addItem( itemSomething, QStringLiteral( "Something" ) ); - setCurrentGroup( QLatin1String( "Group8b2" ) ); + setCurrentGroup( QStringLiteral( "Group8b2" ) ); Test8a::ItemBool *itemFooBoo; - itemFooBoo = new Test8a::ItemBool( currentGroup(), QLatin1String( "FooBoo" ), mFooBoo, false ); - addItem( itemFooBoo, QLatin1String( "FooBoo" ) ); + itemFooBoo = new Test8a::ItemBool( currentGroup(), QStringLiteral( "FooBoo" ), mFooBoo, false ); + addItem( itemFooBoo, QStringLiteral( "FooBoo" ) ); Test8a::ItemUInt *itemPort; - itemPort = new Test8a::ItemUInt( currentGroup(), QLatin1String( "Port" ), mPort, 1000 ); - addItem( itemPort, QLatin1String( "Port" ) ); + itemPort = new Test8a::ItemUInt( currentGroup(), QStringLiteral( "Port" ), mPort, 1000 ); + addItem( itemPort, QStringLiteral( "Port" ) ); } Test8b::~Test8b() diff --git a/autotests/kconfig_compiler/test9.cpp.ref b/autotests/kconfig_compiler/test9.cpp.ref index bc65f430..c5eb772b 100644 --- a/autotests/kconfig_compiler/test9.cpp.ref +++ b/autotests/kconfig_compiler/test9.cpp.ref @@ -4,29 +4,29 @@ #include "test9.h" Test9::Test9( const QString & transport, const QString & folder ) - : KConfigSkeleton( QLatin1String( "examplerc" ) ) + : KConfigSkeleton( QStringLiteral( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { - setCurrentGroup( QLatin1String( "MyOptionsXX" ) ); + setCurrentGroup( QStringLiteral( "MyOptionsXX" ) ); QStringList defaultMyStringList; defaultMyStringList.append( QString::fromUtf8( "up" ) ); defaultMyStringList.append( QString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), QLatin1String( "MyStringList" ), mMyStringList, defaultMyStringList ); - addItem( itemMyStringList, QLatin1String( "MyStringList" ) ); + itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), QStringLiteral( "MyStringList" ), mMyStringList, defaultMyStringList ); + addItem( itemMyStringList, QStringLiteral( "MyStringList" ) ); QStringList defaultMyPathList; defaultMyPathList.append( QString::fromUtf8( "/home" ) ); defaultMyPathList.append( QString::fromUtf8( "~" ) ); KConfigSkeleton::ItemPathList *itemMyPathList; - itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), QLatin1String( "MyPathList" ), mMyPathList, defaultMyPathList ); - addItem( itemMyPathList, QLatin1String( "MyPathList" ) ); + itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), QStringLiteral( "MyPathList" ), mMyPathList, defaultMyPathList ); + addItem( itemMyPathList, QStringLiteral( "MyPathList" ) ); KConfigSkeleton::ItemPathList *itemMyPathsList2; - itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), QLatin1String( "MyPathsList2" ), mMyPathsList2, QStringList(QString::fromLatin1("/usr/bin")) << QDir::homePath() ); - addItem( itemMyPathsList2, QLatin1String( "MyPathsList2" ) ); + itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), QStringLiteral( "MyPathsList2" ), mMyPathsList2, QStringList(QString::fromLatin1("/usr/bin")) << QDir::homePath() ); + addItem( itemMyPathsList2, QStringLiteral( "MyPathsList2" ) ); } Test9::~Test9() diff --git a/autotests/kconfig_compiler/test_dpointer.cpp.ref b/autotests/kconfig_compiler/test_dpointer.cpp.ref index 7933bfb3..17ed2091 100644 --- a/autotests/kconfig_compiler/test_dpointer.cpp.ref +++ b/autotests/kconfig_compiler/test_dpointer.cpp.ref @@ -64,93 +64,93 @@ TestDPointer *TestDPointer::self() } TestDPointer::TestDPointer( ) - : KConfigSkeleton( QLatin1String( "korganizerrc" ) ) + : KConfigSkeleton( QStringLiteral( "korganizerrc" ) ) { d = new TestDPointerPrivate; Q_ASSERT(!s_globalTestDPointer()->q); s_globalTestDPointer()->q = this; - setCurrentGroup( QLatin1String( "General" ) ); + setCurrentGroup( QStringLiteral( "General" ) ); - d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "Auto Save" ), d->autoSave, false ); + d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "Auto Save" ), d->autoSave, false ); d->autoSaveItem->setLabel( QCoreApplication::translate("TestDPointer", "Enable automatic saving of calendar") ); d->autoSaveItem->setWhatsThis( QCoreApplication::translate("TestDPointer", "WhatsThis text for AutoSave option") ); - addItem( d->autoSaveItem, QLatin1String( "AutoSave" ) ); - d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Auto Save Interval" ), d->autoSaveInterval, 10 ); + addItem( d->autoSaveItem, QStringLiteral( "AutoSave" ) ); + d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Auto Save Interval" ), d->autoSaveInterval, 10 ); d->autoSaveIntervalItem->setLabel( QCoreApplication::translate("TestDPointer", "Auto Save Interval") ); - addItem( d->autoSaveIntervalItem, QLatin1String( "AutoSaveInterval" ) ); - d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "Confirm Deletes" ), d->confirm, true ); + addItem( d->autoSaveIntervalItem, QStringLiteral( "AutoSaveInterval" ) ); + d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "Confirm Deletes" ), d->confirm, true ); d->confirmItem->setLabel( QCoreApplication::translate("TestDPointer", "Confirm deletes") ); - addItem( d->confirmItem, QLatin1String( "Confirm" ) ); - d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "Archive File" ), d->archiveFile ); + addItem( d->confirmItem, QStringLiteral( "Confirm" ) ); + d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "Archive File" ), d->archiveFile ); d->archiveFileItem->setLabel( QCoreApplication::translate("TestDPointer", "Archive File") ); - addItem( d->archiveFileItem, QLatin1String( "ArchiveFile" ) ); + addItem( d->archiveFileItem, QStringLiteral( "ArchiveFile" ) ); QList<KConfigSkeleton::ItemEnum::Choice> valuesDestination; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("standardDestination"); + choice.name = QStringLiteral("standardDestination"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("askDestination"); + choice.name = QStringLiteral("askDestination"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("argl1"); + choice.name = QStringLiteral("argl1"); choice.label = QCoreApplication::translate("TestDPointer", "Argl1 Label"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("argl2"); + choice.name = QStringLiteral("argl2"); choice.whatsThis = QCoreApplication::translate("TestDPointer", "Argl2 Whatsthis"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = QLatin1String("argl3"); + choice.name = QStringLiteral("argl3"); choice.label = QCoreApplication::translate("TestDPointer", "Argl3 Label"); choice.whatsThis = QCoreApplication::translate("TestDPointer", "Argl3 Whatsthis"); valuesDestination.append( choice ); } - d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); + d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), QStringLiteral( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); d->destinationItem->setLabel( QCoreApplication::translate("TestDPointer", "New Events/Todos Should") ); - addItem( d->destinationItem, QLatin1String( "Destination" ) ); + addItem( d->destinationItem, QStringLiteral( "Destination" ) ); - setCurrentGroup( QLatin1String( "Views" ) ); + setCurrentGroup( QStringLiteral( "Views" ) ); - d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Hour Size" ), d->hourSize, 10 ); + d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Hour Size" ), d->hourSize, 10 ); d->hourSizeItem->setLabel( QCoreApplication::translate("TestDPointer", "Hour Size") ); - addItem( d->hourSizeItem, QLatin1String( "HourSize" ) ); - d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); + addItem( d->hourSizeItem, QStringLiteral( "HourSize" ) ); + d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); d->selectionStartsEditorItem->setLabel( QCoreApplication::translate("TestDPointer", "Time range selection in agenda view starts event editor") ); - addItem( d->selectionStartsEditorItem, QLatin1String( "SelectionStartsEditor" ) ); + addItem( d->selectionStartsEditorItem, QStringLiteral( "SelectionStartsEditor" ) ); - setCurrentGroup( QLatin1String( "KOrganizer Plugins" ) ); + setCurrentGroup( QStringLiteral( "KOrganizer Plugins" ) ); QStringList defaultSelectedPlugins; defaultSelectedPlugins.append( QString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( QString::fromUtf8( "webexport" ) ); - d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), QLatin1String( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); + d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), QStringLiteral( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); d->selectedPluginsItem->setLabel( QCoreApplication::translate("TestDPointer", "SelectedPlugins") ); - addItem( d->selectedPluginsItem, QLatin1String( "SelectedPlugins" ) ); + addItem( d->selectedPluginsItem, QStringLiteral( "SelectedPlugins" ) ); - setCurrentGroup( QLatin1String( "Colors" ) ); + setCurrentGroup( QStringLiteral( "Colors" ) ); - d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "Highlight Color" ), d->highlightColor, QColor( 100, 100, 255 ) ); + d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "Highlight Color" ), d->highlightColor, QColor( 100, 100, 255 ) ); d->highlightColorItem->setLabel( QCoreApplication::translate("TestDPointer", "Highlight color") ); - addItem( d->highlightColorItem, QLatin1String( "HighlightColor" ) ); - d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "Agenda Background Color" ), d->agendaBgColor, QColor( 255, 255, 255 ) ); + addItem( d->highlightColorItem, QStringLiteral( "HighlightColor" ) ); + d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "Agenda Background Color" ), d->agendaBgColor, QColor( 255, 255, 255 ) ); d->agendaBgColorItem->setLabel( QCoreApplication::translate("TestDPointer", "Agenda view background color") ); - addItem( d->agendaBgColorItem, QLatin1String( "AgendaBgColor" ) ); + addItem( d->agendaBgColorItem, QStringLiteral( "AgendaBgColor" ) ); - setCurrentGroup( QLatin1String( "Fonts" ) ); + setCurrentGroup( QStringLiteral( "Fonts" ) ); - d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), QLatin1String( "TimeBar Font" ), d->timeBarFont ); + d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), QStringLiteral( "TimeBar Font" ), d->timeBarFont ); d->timeBarFontItem->setLabel( QCoreApplication::translate("TestDPointer", "Time bar") ); - addItem( d->timeBarFontItem, QLatin1String( "TimeBarFont" ) ); + addItem( d->timeBarFontItem, QStringLiteral( "TimeBarFont" ) ); } void TestDPointer::setAutoSave( bool v ) diff --git a/autotests/kconfig_compiler/test_qdebugcategory.cpp.ref b/autotests/kconfig_compiler/test_qdebugcategory.cpp.ref index f2eea333..1eb6ed96 100644 --- a/autotests/kconfig_compiler/test_qdebugcategory.cpp.ref +++ b/autotests/kconfig_compiler/test_qdebugcategory.cpp.ref @@ -4,25 +4,25 @@ #include "test_qdebugcategory.h" TestQCategory::TestQCategory( int Number ) - : KConfigSkeleton( QLatin1String( "test7rc" ) ) + : KConfigSkeleton( QStringLiteral( "test7rc" ) ) , mParamNumber(Number) { - setCurrentGroup( QLatin1String( "Foo" ) ); + setCurrentGroup( QStringLiteral( "Foo" ) ); KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), QString( QLatin1String( "color #%1" ) ).arg( mParamNumber ), mColor, QColor( "red" ) ); - addItem( itemColor, QLatin1String( "Color" ) ); + itemColor = new KConfigSkeleton::ItemColor( currentGroup(), QStringLiteral( "color #%1" ).arg( mParamNumber ), mColor, QColor( "red" ) ); + addItem( itemColor, QStringLiteral( "Color" ) ); - setCurrentGroup( QString( QLatin1String( "Bar%1" ) ).arg( mParamNumber ) ); + setCurrentGroup( QStringLiteral( "Bar%1" ).arg( mParamNumber ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "foo bar" ), mFooBar ); - addItem( itemFooBar, QLatin1String( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "foo bar" ), mFooBar ); + addItem( itemFooBar, QStringLiteral( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QStringLiteral( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, QLatin1String( "Age" ) ); + addItem( itemAge, QStringLiteral( "Age" ) ); } TestQCategory::~TestQCategory() diff --git a/autotests/kconfig_compiler/test_signal.cpp.ref b/autotests/kconfig_compiler/test_signal.cpp.ref index e959571a..8afd6741 100644 --- a/autotests/kconfig_compiler/test_signal.cpp.ref +++ b/autotests/kconfig_compiler/test_signal.cpp.ref @@ -25,30 +25,30 @@ TestSignal *TestSignal::self() } TestSignal::TestSignal( ) - : KConfigSkeleton( QLatin1String( "kconfig_compiler_kf5_test_rc" ) ) + : KConfigSkeleton( QStringLiteral( "kconfig_compiler_kf5_test_rc" ) ) , mSettingsChanged(0) { Q_ASSERT(!s_globalTestSignal()->q); s_globalTestSignal()->q = this; KConfigCompilerSignallingItem::NotifyFunction notifyFunction = static_cast<KConfigCompilerSignallingItem::NotifyFunction>(&TestSignal::itemChanged); - setCurrentGroup( QLatin1String( "Appearance" ) ); + setCurrentGroup( QStringLiteral( "Appearance" ) ); KConfigCompilerSignallingItem *itemEmoticonTheme; - itemEmoticonTheme = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "emoticonTheme" ), mEmoticonTheme, QLatin1String( "Default" ) ), this, notifyFunction, signalEmoticonSettingsChanged); - addItem( itemEmoticonTheme, QLatin1String( "emoticonTheme" ) ); + itemEmoticonTheme = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "emoticonTheme" ), mEmoticonTheme, QStringLiteral( "Default" ) ), this, notifyFunction, signalEmoticonSettingsChanged); + addItem( itemEmoticonTheme, QStringLiteral( "emoticonTheme" ) ); KConfigCompilerSignallingItem *itemUseEmoticon; - itemUseEmoticon = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "useEmoticon" ), mUseEmoticon, true ), this, notifyFunction, signalEmoticonSettingsChanged); - addItem( itemUseEmoticon, QLatin1String( "useEmoticon" ) ); + itemUseEmoticon = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "useEmoticon" ), mUseEmoticon, true ), this, notifyFunction, signalEmoticonSettingsChanged); + addItem( itemUseEmoticon, QStringLiteral( "useEmoticon" ) ); KConfigCompilerSignallingItem *itemEmoticonRequireSpace; - itemEmoticonRequireSpace = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "emoticonRequireSpace" ), mEmoticonRequireSpace, true ), this, notifyFunction, signalEmoticonSettingsChanged); - addItem( itemEmoticonRequireSpace, QLatin1String( "emoticonRequireSpace" ) ); + itemEmoticonRequireSpace = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "emoticonRequireSpace" ), mEmoticonRequireSpace, true ), this, notifyFunction, signalEmoticonSettingsChanged); + addItem( itemEmoticonRequireSpace, QStringLiteral( "emoticonRequireSpace" ) ); KConfigCompilerSignallingItem *itemStylePath; - itemStylePath = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "stylePath" ), mStylePath ), this, notifyFunction, signalStyleChanged); - addItem( itemStylePath, QLatin1String( "stylePath" ) ); + itemStylePath = new KConfigCompilerSignallingItem(new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "stylePath" ), mStylePath ), this, notifyFunction, signalStyleChanged); + addItem( itemStylePath, QStringLiteral( "stylePath" ) ); KConfigSkeleton::ItemString *itemStyleCSSVariant; - itemStyleCSSVariant = new KConfigSkeleton::ItemString( currentGroup(), QLatin1String( "styleVariant" ), mStyleCSSVariant ); - addItem( itemStyleCSSVariant, QLatin1String( "StyleCSSVariant" ) ); + itemStyleCSSVariant = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "styleVariant" ), mStyleCSSVariant ); + addItem( itemStyleCSSVariant, QStringLiteral( "StyleCSSVariant" ) ); } TestSignal::~TestSignal() diff --git a/autotests/kconfig_compiler/test_translation_kde.cpp.ref b/autotests/kconfig_compiler/test_translation_kde.cpp.ref index 5c11133d..c42408e5 100644 --- a/autotests/kconfig_compiler/test_translation_kde.cpp.ref +++ b/autotests/kconfig_compiler/test_translation_kde.cpp.ref @@ -8,15 +8,15 @@ using namespace TestNameSpace; TestTranslationKde::TestTranslationKde( ) - : KConfigSkeleton( QLatin1String( "test_translation_rc" ) ) + : KConfigSkeleton( QStringLiteral( "test_translation_rc" ) ) { - setCurrentGroup( QLatin1String( "General" ) ); + setCurrentGroup( QStringLiteral( "General" ) ); KConfigSkeleton::ItemBool *itemAutoSave; - itemAutoSave = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "Auto Save" ), mAutoSave, false ); + itemAutoSave = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "Auto Save" ), mAutoSave, false ); itemAutoSave->setLabel( i18n("Enable automatic saving of calendar") ); itemAutoSave->setWhatsThis( i18nc("@info:whatsthis", "Enable automatic saving of calendars to have calendars saved automatically.") ); - addItem( itemAutoSave, QLatin1String( "AutoSave" ) ); + addItem( itemAutoSave, QStringLiteral( "AutoSave" ) ); } TestTranslationKde::~TestTranslationKde() diff --git a/autotests/kconfig_compiler/test_translation_kde_domain.cpp.ref b/autotests/kconfig_compiler/test_translation_kde_domain.cpp.ref index 66fc4cb9..6704c005 100644 --- a/autotests/kconfig_compiler/test_translation_kde_domain.cpp.ref +++ b/autotests/kconfig_compiler/test_translation_kde_domain.cpp.ref @@ -8,15 +8,15 @@ using namespace TestNameSpace; TestTranslationKdeDomain::TestTranslationKdeDomain( ) - : KConfigSkeleton( QLatin1String( "test_translation_rc" ) ) + : KConfigSkeleton( QStringLiteral( "test_translation_rc" ) ) { - setCurrentGroup( QLatin1String( "General" ) ); + setCurrentGroup( QStringLiteral( "General" ) ); KConfigSkeleton::ItemBool *itemAutoSave; - itemAutoSave = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "Auto Save" ), mAutoSave, false ); + itemAutoSave = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "Auto Save" ), mAutoSave, false ); itemAutoSave->setLabel( i18nd("test-kcfg-kde", "Enable automatic saving of calendar") ); itemAutoSave->setWhatsThis( i18ndc("test-kcfg-kde", "@info:whatsthis", "Enable automatic saving of calendars to have calendars saved automatically.") ); - addItem( itemAutoSave, QLatin1String( "AutoSave" ) ); + addItem( itemAutoSave, QStringLiteral( "AutoSave" ) ); } TestTranslationKdeDomain::~TestTranslationKdeDomain() diff --git a/autotests/kconfig_compiler/test_translation_qt.cpp.ref b/autotests/kconfig_compiler/test_translation_qt.cpp.ref index f5ae7273..e0685be3 100644 --- a/autotests/kconfig_compiler/test_translation_qt.cpp.ref +++ b/autotests/kconfig_compiler/test_translation_qt.cpp.ref @@ -6,15 +6,15 @@ using namespace TestNameSpace; TestTranslationQt::TestTranslationQt( ) - : KConfigSkeleton( QLatin1String( "test_translation_rc" ) ) + : KConfigSkeleton( QStringLiteral( "test_translation_rc" ) ) { - setCurrentGroup( QLatin1String( "General" ) ); + setCurrentGroup( QStringLiteral( "General" ) ); KConfigSkeleton::ItemBool *itemAutoSave; - itemAutoSave = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "Auto Save" ), mAutoSave, false ); + itemAutoSave = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "Auto Save" ), mAutoSave, false ); itemAutoSave->setLabel( QCoreApplication::translate("TestTranslationQt", "Enable automatic saving of calendar") ); itemAutoSave->setWhatsThis( /*: @info:whatsthis */ QCoreApplication::translate("TestTranslationQt", "Enable automatic saving of calendars to have calendars saved automatically.") ); - addItem( itemAutoSave, QLatin1String( "AutoSave" ) ); + addItem( itemAutoSave, QStringLiteral( "AutoSave" ) ); } TestTranslationQt::~TestTranslationQt() |