diff options
| -rw-r--r-- | autotests/kconfig_compiler/test1.h.ref | 18 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test11.h.ref | 30 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test11a.h.ref | 30 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test13.h.ref | 2 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test2.h.ref | 22 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test3.h.ref | 8 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test3a.h.ref | 8 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test4.h.ref | 12 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test5.h.ref | 8 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test6.h.ref | 6 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test7.h.ref | 6 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test8a.h.ref | 4 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test8b.h.ref | 6 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test9.h.ref | 6 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test_dpointer.cpp.ref | 22 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test_qdebugcategory.h.ref | 6 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test_signal.h.ref | 10 | 
17 files changed, 102 insertions, 102 deletions
| diff --git a/autotests/kconfig_compiler/test1.h.ref b/autotests/kconfig_compiler/test1.h.ref index 3410a60d..bbef760d 100644 --- a/autotests/kconfig_compiler/test1.h.ref +++ b/autotests/kconfig_compiler/test1.h.ref @@ -25,7 +25,7 @@ class Test1 : public KConfigSkeleton      */      void setOneOption( bool v )      { -      if (!isImmutable( QString::fromLatin1( "OneOption" ) )) +      if (!isImmutable( QStringLiteral( "OneOption" ) ))          mOneOption = v;      } @@ -42,7 +42,7 @@ class Test1 : public KConfigSkeleton      */      void setAnotherOption( int v )      { -      if (!isImmutable( QString::fromLatin1( "AnotherOption" ) )) +      if (!isImmutable( QStringLiteral( "AnotherOption" ) ))          mAnotherOption = v;      } @@ -59,7 +59,7 @@ class Test1 : public KConfigSkeleton      */      void setListOption( int v )      { -      if (!isImmutable( QString::fromLatin1( "ListOption" ) )) +      if (!isImmutable( QStringLiteral( "ListOption" ) ))          mListOption = v;      } @@ -76,7 +76,7 @@ class Test1 : public KConfigSkeleton      */      void setMyString( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "MyString" ) )) +      if (!isImmutable( QStringLiteral( "MyString" ) ))          mMyString = v;      } @@ -93,7 +93,7 @@ class Test1 : public KConfigSkeleton      */      void setMyPath( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "MyPath" ) )) +      if (!isImmutable( QStringLiteral( "MyPath" ) ))          mMyPath = v;      } @@ -110,7 +110,7 @@ class Test1 : public KConfigSkeleton      */      void setAnotherOption2( int v )      { -      if (!isImmutable( QString::fromLatin1( "AnotherOption2" ) )) +      if (!isImmutable( QStringLiteral( "AnotherOption2" ) ))          mAnotherOption2 = v;      } @@ -127,7 +127,7 @@ class Test1 : public KConfigSkeleton      */      void setMyStringList( const QStringList & v )      { -      if (!isImmutable( QString::fromLatin1( "MyStringList" ) )) +      if (!isImmutable( QStringLiteral( "MyStringList" ) ))          mMyStringList = v;      } @@ -144,7 +144,7 @@ class Test1 : public KConfigSkeleton      */      void setMyStringListHidden( const QStringList & v )      { -      if (!isImmutable( QString::fromLatin1( "MyStringListHidden" ) )) +      if (!isImmutable( QStringLiteral( "MyStringListHidden" ) ))          mMyStringListHidden = v;      } @@ -161,7 +161,7 @@ class Test1 : public KConfigSkeleton      */      void setMyNumber( int v )      { -      if (!isImmutable( QString::fromLatin1( "MyNumber" ) )) +      if (!isImmutable( QStringLiteral( "MyNumber" ) ))          mMyNumber = v;      } diff --git a/autotests/kconfig_compiler/test11.h.ref b/autotests/kconfig_compiler/test11.h.ref index c60bb201..1af66a95 100644 --- a/autotests/kconfig_compiler/test11.h.ref +++ b/autotests/kconfig_compiler/test11.h.ref @@ -29,7 +29,7 @@ class Test11 : public MyPrefs      */      void setAutoSave( bool v )      { -      if (!isImmutable( QString::fromLatin1( "AutoSave" ) )) +      if (!isImmutable( QStringLiteral( "AutoSave" ) ))          mAutoSave = v;      } @@ -62,7 +62,7 @@ class Test11 : public MyPrefs      */      void setAutoSaveInterval( int v )      { -      if (!isImmutable( QString::fromLatin1( "AutoSaveInterval" ) )) +      if (!isImmutable( QStringLiteral( "AutoSaveInterval" ) ))          mAutoSaveInterval = v;      } @@ -95,7 +95,7 @@ class Test11 : public MyPrefs      */      void setConfirm( bool v )      { -      if (!isImmutable( QString::fromLatin1( "Confirm" ) )) +      if (!isImmutable( QStringLiteral( "Confirm" ) ))          mConfirm = v;      } @@ -128,7 +128,7 @@ class Test11 : public MyPrefs      */      void setArchiveFile( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "ArchiveFile" ) )) +      if (!isImmutable( QStringLiteral( "ArchiveFile" ) ))          mArchiveFile = v;      } @@ -153,7 +153,7 @@ class Test11 : public MyPrefs      */      void setDestination( EnumDestination::type v )      { -      if (!isImmutable( QString::fromLatin1( "Destination" ) )) +      if (!isImmutable( QStringLiteral( "Destination" ) ))          mDestination = v;      } @@ -186,7 +186,7 @@ class Test11 : public MyPrefs      */      void setHourSize( int v )      { -      if (!isImmutable( QString::fromLatin1( "HourSize" ) )) +      if (!isImmutable( QStringLiteral( "HourSize" ) ))          mHourSize = v;      } @@ -219,7 +219,7 @@ class Test11 : public MyPrefs      */      void setSelectionStartsEditor( bool v )      { -      if (!isImmutable( QString::fromLatin1( "SelectionStartsEditor" ) )) +      if (!isImmutable( QStringLiteral( "SelectionStartsEditor" ) ))          mSelectionStartsEditor = v;      } @@ -252,7 +252,7 @@ class Test11 : public MyPrefs      */      void setSelectedPlugins( const QStringList & v )      { -      if (!isImmutable( QString::fromLatin1( "SelectedPlugins" ) )) +      if (!isImmutable( QStringLiteral( "SelectedPlugins" ) ))          mSelectedPlugins = v;      } @@ -285,7 +285,7 @@ class Test11 : public MyPrefs      */      void setHighlightColor( const QColor & v )      { -      if (!isImmutable( QString::fromLatin1( "HighlightColor" ) )) +      if (!isImmutable( QStringLiteral( "HighlightColor" ) ))          mHighlightColor = v;      } @@ -318,7 +318,7 @@ class Test11 : public MyPrefs      */      void setAgendaBgColor( const QColor & v )      { -      if (!isImmutable( QString::fromLatin1( "AgendaBgColor" ) )) +      if (!isImmutable( QStringLiteral( "AgendaBgColor" ) ))          mAgendaBgColor = v;      } @@ -351,7 +351,7 @@ class Test11 : public MyPrefs      */      void setTimeBarFont( const QFont & v )      { -      if (!isImmutable( QString::fromLatin1( "TimeBarFont" ) )) +      if (!isImmutable( QStringLiteral( "TimeBarFont" ) ))          mTimeBarFont = v;      } @@ -376,7 +376,7 @@ class Test11 : public MyPrefs      */      void setEmailClient( MailClient v )      { -      if (!isImmutable( QString::fromLatin1( "EmailClient" ) )) +      if (!isImmutable( QStringLiteral( "EmailClient" ) ))          mEmailClient = v;      } @@ -409,7 +409,7 @@ class Test11 : public MyPrefs      */      void setDefaultReminderUnits( TimePeriod::Units v )      { -      if (!isImmutable( QString::fromLatin1( "DefaultReminderUnits" ) )) +      if (!isImmutable( QStringLiteral( "DefaultReminderUnits" ) ))          mDefaultReminderUnits = v;      } @@ -442,7 +442,7 @@ class Test11 : public MyPrefs      */      void setQueueRate( int i, const QList<int> & v )      { -      if (!isImmutable( QString::fromLatin1( "queueRate%1" ).arg( i ) )) +      if (!isImmutable( QStringLiteral( "queueRate%1" ).arg( i ) ))          mQueueRate[i] = v;      } @@ -475,7 +475,7 @@ class Test11 : public MyPrefs      */      void setShowQueueTuner( bool v )      { -      if (!isImmutable( QString::fromLatin1( "ShowQueueTuner" ) )) +      if (!isImmutable( QStringLiteral( "ShowQueueTuner" ) ))          mShowQueueTuner = v;      } diff --git a/autotests/kconfig_compiler/test11a.h.ref b/autotests/kconfig_compiler/test11a.h.ref index 16bdb760..23c83713 100644 --- a/autotests/kconfig_compiler/test11a.h.ref +++ b/autotests/kconfig_compiler/test11a.h.ref @@ -29,7 +29,7 @@ class Test11a : public MyPrefs      */      void setAutoSave( bool v )      { -      if (!isImmutable( QString::fromLatin1( "AutoSave" ) )) +      if (!isImmutable( QStringLiteral( "AutoSave" ) ))          mAutoSave = v;      } @@ -54,7 +54,7 @@ class Test11a : public MyPrefs      */      void setAutoSaveInterval( int v )      { -      if (!isImmutable( QString::fromLatin1( "AutoSaveInterval" ) )) +      if (!isImmutable( QStringLiteral( "AutoSaveInterval" ) ))          mAutoSaveInterval = v;      } @@ -79,7 +79,7 @@ class Test11a : public MyPrefs      */      void setConfirm( bool v )      { -      if (!isImmutable( QString::fromLatin1( "Confirm" ) )) +      if (!isImmutable( QStringLiteral( "Confirm" ) ))          mConfirm = v;      } @@ -104,7 +104,7 @@ class Test11a : public MyPrefs      */      void setArchiveFile( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "ArchiveFile" ) )) +      if (!isImmutable( QStringLiteral( "ArchiveFile" ) ))          mArchiveFile = v;      } @@ -129,7 +129,7 @@ class Test11a : public MyPrefs      */      void setDestination( EnumDestination::type v )      { -      if (!isImmutable( QString::fromLatin1( "Destination" ) )) +      if (!isImmutable( QStringLiteral( "Destination" ) ))          mDestination = v;      } @@ -162,7 +162,7 @@ class Test11a : public MyPrefs      */      void setHourSize( int v )      { -      if (!isImmutable( QString::fromLatin1( "HourSize" ) )) +      if (!isImmutable( QStringLiteral( "HourSize" ) ))          mHourSize = v;      } @@ -187,7 +187,7 @@ class Test11a : public MyPrefs      */      void setSelectionStartsEditor( bool v )      { -      if (!isImmutable( QString::fromLatin1( "SelectionStartsEditor" ) )) +      if (!isImmutable( QStringLiteral( "SelectionStartsEditor" ) ))          mSelectionStartsEditor = v;      } @@ -220,7 +220,7 @@ class Test11a : public MyPrefs      */      void setSelectedPlugins( const QStringList & v )      { -      if (!isImmutable( QString::fromLatin1( "SelectedPlugins" ) )) +      if (!isImmutable( QStringLiteral( "SelectedPlugins" ) ))          mSelectedPlugins = v;      } @@ -245,7 +245,7 @@ class Test11a : public MyPrefs      */      void setHighlightColor( const QColor & v )      { -      if (!isImmutable( QString::fromLatin1( "HighlightColor" ) )) +      if (!isImmutable( QStringLiteral( "HighlightColor" ) ))          mHighlightColor = v;      } @@ -270,7 +270,7 @@ class Test11a : public MyPrefs      */      void setAgendaBgColor( const QColor & v )      { -      if (!isImmutable( QString::fromLatin1( "AgendaBgColor" ) )) +      if (!isImmutable( QStringLiteral( "AgendaBgColor" ) ))          mAgendaBgColor = v;      } @@ -295,7 +295,7 @@ class Test11a : public MyPrefs      */      void setTimeBarFont( const QFont & v )      { -      if (!isImmutable( QString::fromLatin1( "TimeBarFont" ) )) +      if (!isImmutable( QStringLiteral( "TimeBarFont" ) ))          mTimeBarFont = v;      } @@ -320,7 +320,7 @@ class Test11a : public MyPrefs      */      void setEmailClient( MailClient v )      { -      if (!isImmutable( QString::fromLatin1( "EmailClient" ) )) +      if (!isImmutable( QStringLiteral( "EmailClient" ) ))          mEmailClient = v;      } @@ -345,7 +345,7 @@ class Test11a : public MyPrefs      */      void setDefaultReminderUnits( TimePeriod::Units v )      { -      if (!isImmutable( QString::fromLatin1( "DefaultReminderUnits" ) )) +      if (!isImmutable( QStringLiteral( "DefaultReminderUnits" ) ))          mDefaultReminderUnits = v;      } @@ -378,7 +378,7 @@ class Test11a : public MyPrefs      */      void setQueueRate( int i, const QList<int> & v )      { -      if (!isImmutable( QString::fromLatin1( "queueRate%1" ).arg( i ) )) +      if (!isImmutable( QStringLiteral( "queueRate%1" ).arg( i ) ))          mQueueRate[i] = v;      } @@ -403,7 +403,7 @@ class Test11a : public MyPrefs      */      void setShowQueueTuner( bool v )      { -      if (!isImmutable( QString::fromLatin1( "ShowQueueTuner" ) )) +      if (!isImmutable( QStringLiteral( "ShowQueueTuner" ) ))          mShowQueueTuner = v;      } diff --git a/autotests/kconfig_compiler/test13.h.ref b/autotests/kconfig_compiler/test13.h.ref index 0636ad2f..441643f7 100644 --- a/autotests/kconfig_compiler/test13.h.ref +++ b/autotests/kconfig_compiler/test13.h.ref @@ -31,7 +31,7 @@ class Test13 : public KConfigSkeleton      */      void setBrightness( double v )      { -      if (v != mBrightness && !isImmutable( QString::fromLatin1( "brightness" ) )) { +      if (v != mBrightness && !isImmutable( QStringLiteral( "brightness" ) )) {          mBrightness = v;          Q_EMIT brightnessChanged();        } diff --git a/autotests/kconfig_compiler/test2.h.ref b/autotests/kconfig_compiler/test2.h.ref index 77ba56f9..ce7ff259 100644 --- a/autotests/kconfig_compiler/test2.h.ref +++ b/autotests/kconfig_compiler/test2.h.ref @@ -23,7 +23,7 @@ class Test2 : public MyPrefs      */      void setAutoSave( bool v )      { -      if (!isImmutable( QString::fromLatin1( "AutoSave" ) )) +      if (!isImmutable( QStringLiteral( "AutoSave" ) ))          mAutoSave = v;      } @@ -48,7 +48,7 @@ class Test2 : public MyPrefs      */      void setAutoSaveInterval( int v )      { -      if (!isImmutable( QString::fromLatin1( "AutoSaveInterval" ) )) +      if (!isImmutable( QStringLiteral( "AutoSaveInterval" ) ))          mAutoSaveInterval = v;      } @@ -73,7 +73,7 @@ class Test2 : public MyPrefs      */      void setConfirm( bool v )      { -      if (!isImmutable( QString::fromLatin1( "Confirm" ) )) +      if (!isImmutable( QStringLiteral( "Confirm" ) ))          mConfirm = v;      } @@ -98,7 +98,7 @@ class Test2 : public MyPrefs      */      void setArchiveFile( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "ArchiveFile" ) )) +      if (!isImmutable( QStringLiteral( "ArchiveFile" ) ))          mArchiveFile = v;      } @@ -123,7 +123,7 @@ class Test2 : public MyPrefs      */      void setDestination( int v )      { -      if (!isImmutable( QString::fromLatin1( "Destination" ) )) +      if (!isImmutable( QStringLiteral( "Destination" ) ))          mDestination = v;      } @@ -148,7 +148,7 @@ class Test2 : public MyPrefs      */      void setHourSize( int v )      { -      if (!isImmutable( QString::fromLatin1( "HourSize" ) )) +      if (!isImmutable( QStringLiteral( "HourSize" ) ))          mHourSize = v;      } @@ -173,7 +173,7 @@ class Test2 : public MyPrefs      */      void setSelectionStartsEditor( bool v )      { -      if (!isImmutable( QString::fromLatin1( "SelectionStartsEditor" ) )) +      if (!isImmutable( QStringLiteral( "SelectionStartsEditor" ) ))          mSelectionStartsEditor = v;      } @@ -198,7 +198,7 @@ class Test2 : public MyPrefs      */      void setSelectedPlugins( const QStringList & v )      { -      if (!isImmutable( QString::fromLatin1( "SelectedPlugins" ) )) +      if (!isImmutable( QStringLiteral( "SelectedPlugins" ) ))          mSelectedPlugins = v;      } @@ -223,7 +223,7 @@ class Test2 : public MyPrefs      */      void setHighlightColor( const QColor & v )      { -      if (!isImmutable( QString::fromLatin1( "HighlightColor" ) )) +      if (!isImmutable( QStringLiteral( "HighlightColor" ) ))          mHighlightColor = v;      } @@ -248,7 +248,7 @@ class Test2 : public MyPrefs      */      void setAgendaBgColor( const QColor & v )      { -      if (!isImmutable( QString::fromLatin1( "AgendaBgColor" ) )) +      if (!isImmutable( QStringLiteral( "AgendaBgColor" ) ))          mAgendaBgColor = v;      } @@ -273,7 +273,7 @@ class Test2 : public MyPrefs      */      void setTimeBarFont( const QFont & v )      { -      if (!isImmutable( QString::fromLatin1( "TimeBarFont" ) )) +      if (!isImmutable( QStringLiteral( "TimeBarFont" ) ))          mTimeBarFont = v;      } diff --git a/autotests/kconfig_compiler/test3.h.ref b/autotests/kconfig_compiler/test3.h.ref index bee48fb0..2b8ef539 100644 --- a/autotests/kconfig_compiler/test3.h.ref +++ b/autotests/kconfig_compiler/test3.h.ref @@ -22,7 +22,7 @@ class Test3 : public KConfigSkeleton      */      void setAutoSave( bool v )      { -      if (!isImmutable( QString::fromLatin1( "AutoSave" ) )) +      if (!isImmutable( QStringLiteral( "AutoSave" ) ))          mAutoSave = v;      } @@ -47,7 +47,7 @@ class Test3 : public KConfigSkeleton      */      void setBlubb( int v )      { -      if (!isImmutable( QString::fromLatin1( "Blubb" ) )) +      if (!isImmutable( QStringLiteral( "Blubb" ) ))          mBlubb = v;      } @@ -72,7 +72,7 @@ class Test3 : public KConfigSkeleton      */      void setBlahBlah( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "BlahBlah" ) )) +      if (!isImmutable( QStringLiteral( "BlahBlah" ) ))          mBlahBlah = v;      } @@ -97,7 +97,7 @@ class Test3 : public KConfigSkeleton      */      void setMyPassword( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "MyPassword" ) )) +      if (!isImmutable( QStringLiteral( "MyPassword" ) ))          mMyPassword = v;      } diff --git a/autotests/kconfig_compiler/test3a.h.ref b/autotests/kconfig_compiler/test3a.h.ref index a44ce841..dbe009dc 100644 --- a/autotests/kconfig_compiler/test3a.h.ref +++ b/autotests/kconfig_compiler/test3a.h.ref @@ -23,7 +23,7 @@ class Test3a : public KConfigSkeleton      */      void setAutoSave( bool v )      { -      if (!isImmutable( QString::fromLatin1( "AutoSave" ) )) +      if (!isImmutable( QStringLiteral( "AutoSave" ) ))          mAutoSave = v;      } @@ -48,7 +48,7 @@ class Test3a : public KConfigSkeleton      */      void setBlubb( int v )      { -      if (!isImmutable( QString::fromLatin1( "Blubb" ) )) +      if (!isImmutable( QStringLiteral( "Blubb" ) ))          mBlubb = v;      } @@ -73,7 +73,7 @@ class Test3a : public KConfigSkeleton      */      void setBlahBlah( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "BlahBlah" ) )) +      if (!isImmutable( QStringLiteral( "BlahBlah" ) ))          mBlahBlah = v;      } @@ -98,7 +98,7 @@ class Test3a : public KConfigSkeleton      */      void setMyPassword( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "MyPassword" ) )) +      if (!isImmutable( QStringLiteral( "MyPassword" ) ))          mMyPassword = v;      } diff --git a/autotests/kconfig_compiler/test4.h.ref b/autotests/kconfig_compiler/test4.h.ref index 9a74d3f0..1d5d1d87 100644 --- a/autotests/kconfig_compiler/test4.h.ref +++ b/autotests/kconfig_compiler/test4.h.ref @@ -31,7 +31,7 @@ class Test4 : public KConfigSkeleton      static      void setColor( int i, const QColor & v )      { -      if (!self()->isImmutable( QString::fromLatin1( "Color%1" ).arg( i ) )) +      if (!self()->isImmutable( QStringLiteral( "Color%1" ).arg( i ) ))          self()->mColor[i] = v;      } @@ -50,7 +50,7 @@ class Test4 : public KConfigSkeleton      static      void setMouseAction( int i, int v )      { -      if (!self()->isImmutable( QString::fromLatin1( "MouseAction%1" ).arg( QLatin1String( EnumButton::enumToString[i] ) ) )) +      if (!self()->isImmutable( QStringLiteral( "MouseAction%1" ).arg( QLatin1String( EnumButton::enumToString[i] ) ) ))          self()->mMouseAction[i] = v;      } @@ -69,7 +69,7 @@ class Test4 : public KConfigSkeleton      static      void setGrayColor( int i, const QColor & v )      { -      if (!self()->isImmutable( QString::fromLatin1( "GrayColor%1" ).arg( i ) )) +      if (!self()->isImmutable( QStringLiteral( "GrayColor%1" ).arg( i ) ))          self()->mGrayColor[i] = v;      } @@ -88,7 +88,7 @@ class Test4 : public KConfigSkeleton      static      void setColorString( int i, const QString & v )      { -      if (!self()->isImmutable( QString::fromLatin1( "ColorString%1" ).arg( i ) )) +      if (!self()->isImmutable( QStringLiteral( "ColorString%1" ).arg( i ) ))          self()->mColorString[i] = v;      } @@ -107,7 +107,7 @@ class Test4 : public KConfigSkeleton      static      void setFooBar( const QString & v )      { -      if (!self()->isImmutable( QString::fromLatin1( "FooBar" ) )) +      if (!self()->isImmutable( QStringLiteral( "FooBar" ) ))          self()->mFooBar = v;      } @@ -138,7 +138,7 @@ class Test4 : public KConfigSkeleton          v = 88;        } -      if (!self()->isImmutable( QString::fromLatin1( "Age" ) )) +      if (!self()->isImmutable( QStringLiteral( "Age" ) ))          self()->mAge = v;      } diff --git a/autotests/kconfig_compiler/test5.h.ref b/autotests/kconfig_compiler/test5.h.ref index 8d2cab2e..76041741 100644 --- a/autotests/kconfig_compiler/test5.h.ref +++ b/autotests/kconfig_compiler/test5.h.ref @@ -23,7 +23,7 @@ class Test5 : public KConfigSkeleton      static      void setColor( int i, const QColor & v )      { -      if (!self()->isImmutable( QString::fromLatin1( "Color%1" ).arg( i ) )) +      if (!self()->isImmutable( QStringLiteral( "Color%1" ).arg( i ) ))          self()->mColor[i] = v;      } @@ -42,7 +42,7 @@ class Test5 : public KConfigSkeleton      static      void setMouseAction( int i, int v )      { -      if (!self()->isImmutable( QString::fromLatin1( "MouseAction%1" ).arg( QLatin1String( EnumButtonToString[i] ) ) )) +      if (!self()->isImmutable( QStringLiteral( "MouseAction%1" ).arg( QLatin1String( EnumButtonToString[i] ) ) ))          self()->mMouseAction[i] = v;      } @@ -61,7 +61,7 @@ class Test5 : public KConfigSkeleton      static      void setFooBar( const QString & v )      { -      if (!self()->isImmutable( QString::fromLatin1( "FooBar" ) )) +      if (!self()->isImmutable( QStringLiteral( "FooBar" ) ))          self()->mFooBar = v;      } @@ -92,7 +92,7 @@ class Test5 : public KConfigSkeleton          v = 88;        } -      if (!self()->isImmutable( QString::fromLatin1( "Age" ) )) +      if (!self()->isImmutable( QStringLiteral( "Age" ) ))          self()->mAge = v;      } diff --git a/autotests/kconfig_compiler/test6.h.ref b/autotests/kconfig_compiler/test6.h.ref index 7a9998e2..ddc435a1 100644 --- a/autotests/kconfig_compiler/test6.h.ref +++ b/autotests/kconfig_compiler/test6.h.ref @@ -19,7 +19,7 @@ class Test6 : public KConfigSkeleton      */      void setColor( const QColor & v )      { -      if (!isImmutable( QString::fromLatin1( "Color" ) )) +      if (!isImmutable( QStringLiteral( "Color" ) ))          mColor = v;      } @@ -36,7 +36,7 @@ class Test6 : public KConfigSkeleton      */      void setFooBar( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "FooBar" ) )) +      if (!isImmutable( QStringLiteral( "FooBar" ) ))          mFooBar = v;      } @@ -65,7 +65,7 @@ class Test6 : public KConfigSkeleton          v = 88;        } -      if (!isImmutable( QString::fromLatin1( "Age" ) )) +      if (!isImmutable( QStringLiteral( "Age" ) ))          mAge = v;      } diff --git a/autotests/kconfig_compiler/test7.h.ref b/autotests/kconfig_compiler/test7.h.ref index 694dba51..a4eb12b5 100644 --- a/autotests/kconfig_compiler/test7.h.ref +++ b/autotests/kconfig_compiler/test7.h.ref @@ -19,7 +19,7 @@ class Test7 : public KConfigSkeleton      */      void setColor( const QColor & v )      { -      if (!isImmutable( QString::fromLatin1( "Color" ) )) +      if (!isImmutable( QStringLiteral( "Color" ) ))          mColor = v;      } @@ -36,7 +36,7 @@ class Test7 : public KConfigSkeleton      */      void setFooBar( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "FooBar" ) )) +      if (!isImmutable( QStringLiteral( "FooBar" ) ))          mFooBar = v;      } @@ -65,7 +65,7 @@ class Test7 : public KConfigSkeleton          v = 88;        } -      if (!isImmutable( QString::fromLatin1( "Age" ) )) +      if (!isImmutable( QStringLiteral( "Age" ) ))          mAge = v;      } diff --git a/autotests/kconfig_compiler/test8a.h.ref b/autotests/kconfig_compiler/test8a.h.ref index ec9d64b7..e47fbcab 100644 --- a/autotests/kconfig_compiler/test8a.h.ref +++ b/autotests/kconfig_compiler/test8a.h.ref @@ -20,7 +20,7 @@ class Test8a : public KConfigSkeleton      */      void setFont( const QFont & v )      { -      if (!isImmutable( QString::fromLatin1( "Font" ) )) +      if (!isImmutable( QStringLiteral( "Font" ) ))          mFont = v;      } @@ -37,7 +37,7 @@ class Test8a : public KConfigSkeleton      */      void setTitleFont( const QFont & v )      { -      if (!isImmutable( QString::fromLatin1( "TitleFont" ) )) +      if (!isImmutable( QStringLiteral( "TitleFont" ) ))          mTitleFont = v;      } diff --git a/autotests/kconfig_compiler/test8b.h.ref b/autotests/kconfig_compiler/test8b.h.ref index 496ac696..0f71ba7c 100644 --- a/autotests/kconfig_compiler/test8b.h.ref +++ b/autotests/kconfig_compiler/test8b.h.ref @@ -22,7 +22,7 @@ class Test8b : public Test8a      static      void setSomething( uint v )      { -      if (!self()->isImmutable( QString::fromLatin1( "Something" ) )) +      if (!self()->isImmutable( QStringLiteral( "Something" ) ))          self()->mSomething = v;      } @@ -41,7 +41,7 @@ class Test8b : public Test8a      static      void setFooBoo( bool v )      { -      if (!self()->isImmutable( QString::fromLatin1( "FooBoo" ) )) +      if (!self()->isImmutable( QStringLiteral( "FooBoo" ) ))          self()->mFooBoo = v;      } @@ -60,7 +60,7 @@ class Test8b : public Test8a      static      void setPort( uint v )      { -      if (!self()->isImmutable( QString::fromLatin1( "Port" ) )) +      if (!self()->isImmutable( QStringLiteral( "Port" ) ))          self()->mPort = v;      } diff --git a/autotests/kconfig_compiler/test9.h.ref b/autotests/kconfig_compiler/test9.h.ref index f2290f87..9bcf0001 100644 --- a/autotests/kconfig_compiler/test9.h.ref +++ b/autotests/kconfig_compiler/test9.h.ref @@ -20,7 +20,7 @@ class Test9 : public KConfigSkeleton      */      void setMyStringList( const QStringList & v )      { -      if (!isImmutable( QString::fromLatin1( "MyStringList" ) )) +      if (!isImmutable( QStringLiteral( "MyStringList" ) ))          mMyStringList = v;      } @@ -37,7 +37,7 @@ class Test9 : public KConfigSkeleton      */      void setMyPathList( const QStringList & v )      { -      if (!isImmutable( QString::fromLatin1( "MyPathList" ) )) +      if (!isImmutable( QStringLiteral( "MyPathList" ) ))          mMyPathList = v;      } @@ -54,7 +54,7 @@ class Test9 : public KConfigSkeleton      */      void setMyPathsList2( const QStringList & v )      { -      if (!isImmutable( QString::fromLatin1( "MyPathsList2" ) )) +      if (!isImmutable( QStringLiteral( "MyPathsList2" ) ))          mMyPathsList2 = v;      } diff --git a/autotests/kconfig_compiler/test_dpointer.cpp.ref b/autotests/kconfig_compiler/test_dpointer.cpp.ref index 324ba168..7933bfb3 100644 --- a/autotests/kconfig_compiler/test_dpointer.cpp.ref +++ b/autotests/kconfig_compiler/test_dpointer.cpp.ref @@ -155,7 +155,7 @@ TestDPointer::TestDPointer(  )  void TestDPointer::setAutoSave( bool v )  { -      if (!self()->isImmutable( QString::fromLatin1( "AutoSave" ) )) +      if (!self()->isImmutable( QStringLiteral( "AutoSave" ) ))          self()->d->autoSave = v;  } @@ -172,7 +172,7 @@ KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()  void TestDPointer::setAutoSaveInterval( int v )  { -      if (!self()->isImmutable( QString::fromLatin1( "AutoSaveInterval" ) )) +      if (!self()->isImmutable( QStringLiteral( "AutoSaveInterval" ) ))          self()->d->autoSaveInterval = v;  } @@ -189,7 +189,7 @@ KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()  void TestDPointer::setConfirm( bool v )  { -      if (!self()->isImmutable( QString::fromLatin1( "Confirm" ) )) +      if (!self()->isImmutable( QStringLiteral( "Confirm" ) ))          self()->d->confirm = v;  } @@ -206,7 +206,7 @@ KConfigSkeleton::ItemBool *TestDPointer::confirmItem()  void TestDPointer::setArchiveFile( const QString & v )  { -      if (!self()->isImmutable( QString::fromLatin1( "ArchiveFile" ) )) +      if (!self()->isImmutable( QStringLiteral( "ArchiveFile" ) ))          self()->d->archiveFile = v;  } @@ -223,7 +223,7 @@ KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()  void TestDPointer::setDestination( int v )  { -      if (!self()->isImmutable( QString::fromLatin1( "Destination" ) )) +      if (!self()->isImmutable( QStringLiteral( "Destination" ) ))          self()->d->destination = v;  } @@ -240,7 +240,7 @@ KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()  void TestDPointer::setHourSize( int v )  { -      if (!self()->isImmutable( QString::fromLatin1( "HourSize" ) )) +      if (!self()->isImmutable( QStringLiteral( "HourSize" ) ))          self()->d->hourSize = v;  } @@ -257,7 +257,7 @@ KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()  void TestDPointer::setSelectionStartsEditor( bool v )  { -      if (!self()->isImmutable( QString::fromLatin1( "SelectionStartsEditor" ) )) +      if (!self()->isImmutable( QStringLiteral( "SelectionStartsEditor" ) ))          self()->d->selectionStartsEditor = v;  } @@ -274,7 +274,7 @@ KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()  void TestDPointer::setSelectedPlugins( const QStringList & v )  { -      if (!self()->isImmutable( QString::fromLatin1( "SelectedPlugins" ) )) +      if (!self()->isImmutable( QStringLiteral( "SelectedPlugins" ) ))          self()->d->selectedPlugins = v;  } @@ -291,7 +291,7 @@ KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()  void TestDPointer::setHighlightColor( const QColor & v )  { -      if (!self()->isImmutable( QString::fromLatin1( "HighlightColor" ) )) +      if (!self()->isImmutable( QStringLiteral( "HighlightColor" ) ))          self()->d->highlightColor = v;  } @@ -308,7 +308,7 @@ KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()  void TestDPointer::setAgendaBgColor( const QColor & v )  { -      if (!self()->isImmutable( QString::fromLatin1( "AgendaBgColor" ) )) +      if (!self()->isImmutable( QStringLiteral( "AgendaBgColor" ) ))          self()->d->agendaBgColor = v;  } @@ -325,7 +325,7 @@ KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()  void TestDPointer::setTimeBarFont( const QFont & v )  { -      if (!self()->isImmutable( QString::fromLatin1( "TimeBarFont" ) )) +      if (!self()->isImmutable( QStringLiteral( "TimeBarFont" ) ))          self()->d->timeBarFont = v;  } diff --git a/autotests/kconfig_compiler/test_qdebugcategory.h.ref b/autotests/kconfig_compiler/test_qdebugcategory.h.ref index b6d16fc0..14e1ebac 100644 --- a/autotests/kconfig_compiler/test_qdebugcategory.h.ref +++ b/autotests/kconfig_compiler/test_qdebugcategory.h.ref @@ -21,7 +21,7 @@ class TestQCategory : public KConfigSkeleton      */      void setColor( const QColor & v )      { -      if (!isImmutable( QString::fromLatin1( "Color" ) )) +      if (!isImmutable( QStringLiteral( "Color" ) ))          mColor = v;      } @@ -38,7 +38,7 @@ class TestQCategory : public KConfigSkeleton      */      void setFooBar( const QString & v )      { -      if (!isImmutable( QString::fromLatin1( "FooBar" ) )) +      if (!isImmutable( QStringLiteral( "FooBar" ) ))          mFooBar = v;      } @@ -67,7 +67,7 @@ class TestQCategory : public KConfigSkeleton          v = 88;        } -      if (!isImmutable( QString::fromLatin1( "Age" ) )) +      if (!isImmutable( QStringLiteral( "Age" ) ))          mAge = v;      } diff --git a/autotests/kconfig_compiler/test_signal.h.ref b/autotests/kconfig_compiler/test_signal.h.ref index 648b26db..e5361813 100644 --- a/autotests/kconfig_compiler/test_signal.h.ref +++ b/autotests/kconfig_compiler/test_signal.h.ref @@ -21,7 +21,7 @@ class TestSignal : public KConfigSkeleton      static      void setEmoticonTheme( const QString & v )      { -      if (v != self()->mEmoticonTheme && !self()->isImmutable( QString::fromLatin1( "emoticonTheme" ) )) { +      if (v != self()->mEmoticonTheme && !self()->isImmutable( QStringLiteral( "emoticonTheme" ) )) {          self()->mEmoticonTheme = v;          self()->mSettingsChanged |= signalEmoticonSettingsChanged;        } @@ -42,7 +42,7 @@ class TestSignal : public KConfigSkeleton      static      void setUseEmoticon( bool v )      { -      if (v != self()->mUseEmoticon && !self()->isImmutable( QString::fromLatin1( "useEmoticon" ) )) { +      if (v != self()->mUseEmoticon && !self()->isImmutable( QStringLiteral( "useEmoticon" ) )) {          self()->mUseEmoticon = v;          self()->mSettingsChanged |= signalEmoticonSettingsChanged;        } @@ -63,7 +63,7 @@ class TestSignal : public KConfigSkeleton      static      void setEmoticonRequireSpace( bool v )      { -      if (v != self()->mEmoticonRequireSpace && !self()->isImmutable( QString::fromLatin1( "emoticonRequireSpace" ) )) { +      if (v != self()->mEmoticonRequireSpace && !self()->isImmutable( QStringLiteral( "emoticonRequireSpace" ) )) {          self()->mEmoticonRequireSpace = v;          self()->mSettingsChanged |= signalEmoticonSettingsChanged;        } @@ -84,7 +84,7 @@ class TestSignal : public KConfigSkeleton      static      void setStylePath( const QString & v )      { -      if (v != self()->mStylePath && !self()->isImmutable( QString::fromLatin1( "stylePath" ) )) { +      if (v != self()->mStylePath && !self()->isImmutable( QStringLiteral( "stylePath" ) )) {          self()->mStylePath = v;          self()->mSettingsChanged |= signalStyleChanged;        } @@ -105,7 +105,7 @@ class TestSignal : public KConfigSkeleton      static      void setStyleCSSVariant( const QString & v )      { -      if (!self()->isImmutable( QString::fromLatin1( "StyleCSSVariant" ) )) +      if (!self()->isImmutable( QStringLiteral( "StyleCSSVariant" ) ))          self()->mStyleCSSVariant = v;      } | 
