aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMéven Car <meven.car@enioka.com>2020-02-04 16:03:52 +0100
committerMéven Car <meven29@gmail.com>2020-02-04 16:09:29 +0100
commitd46739294d04c72af1e434e414e1c012d7e78a42 (patch)
tree5a227069a6a1a110cc26b788ff8a3bd99005735e
parentfd0e26ddb49122fa55bdc8f35e189c832cc138ad (diff)
downloadkconfig-d46739294d04c72af1e434e414e1c012d7e78a42.tar.gz
kconfig-d46739294d04c72af1e434e414e1c012d7e78a42.tar.bz2
Add an is<PropertyName>Immutable to know if a property is immutable
Summary: Add a utility function is<Parameter>Immutable to access immutability quickly. Generated classes uses them internally to avoid code redundance. Sample: ``` /** Set blocked-by-default */ void setBlockedByDefault( bool v ) { if (v != mBlockedByDefault && !isBlockedByDefaultImmutable() ) { mBlockedByDefault = v; Q_EMIT blockedByDefaultChanged(); } } /** Is blocked-by-default Immutable */ bool isBlockedByDefaultImmutable() { return isImmutable( QStringLiteral( "blockedByDefault" ) ); } ``` ``` /** Set org.kde.ActivityManager.ResourceScoringEnabled */ void setResourceScoringEnabled( bool v ) { if (!isResourceScoringEnabledImmutable() ) mResourceScoringEnabled = v; } /** Is org.kde.ActivityManager.ResourceScoringEnabled Immutable */ bool isResourceScoringEnabledImmutable() { return isImmutable( QStringLiteral( "resourceScoringEnabled" ) ); } ``` Reviewers: ervin, #frameworks, dfaure Reviewed By: ervin Subscribers: dfaure, tcanabrava, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D26368
-rw-r--r--autotests/kconfig_compiler/test1.h.ref90
-rw-r--r--autotests/kconfig_compiler/test10.h.ref18
-rw-r--r--autotests/kconfig_compiler/test11.h.ref150
-rw-r--r--autotests/kconfig_compiler/test11a.h.ref150
-rw-r--r--autotests/kconfig_compiler/test12.h.ref8
-rw-r--r--autotests/kconfig_compiler/test13.h.ref29
-rw-r--r--autotests/kconfig_compiler/test2.h.ref110
-rw-r--r--autotests/kconfig_compiler/test3.h.ref40
-rw-r--r--autotests/kconfig_compiler/test3a.h.ref40
-rw-r--r--autotests/kconfig_compiler/test4.h.ref66
-rw-r--r--autotests/kconfig_compiler/test5.h.ref44
-rw-r--r--autotests/kconfig_compiler/test6.h.ref30
-rw-r--r--autotests/kconfig_compiler/test7.h.ref30
-rw-r--r--autotests/kconfig_compiler/test8a.h.ref20
-rw-r--r--autotests/kconfig_compiler/test8b.h.ref33
-rw-r--r--autotests/kconfig_compiler/test8c.h.ref22
-rw-r--r--autotests/kconfig_compiler/test9.h.ref30
-rw-r--r--autotests/kconfig_compiler/test_dpointer.cpp.ref77
-rw-r--r--autotests/kconfig_compiler/test_dpointer.h.ref66
-rw-r--r--autotests/kconfig_compiler/test_notifiers.h.ref30
-rw-r--r--autotests/kconfig_compiler/test_qdebugcategory.h.ref30
-rw-r--r--autotests/kconfig_compiler/test_signal.h.ref55
-rw-r--r--autotests/kconfig_compiler/test_translation_kde.h.ref8
-rw-r--r--autotests/kconfig_compiler/test_translation_kde_domain.h.ref8
-rw-r--r--autotests/kconfig_compiler/test_translation_qt.h.ref8
-rw-r--r--src/kconfig_compiler/KConfigCodeGeneratorBase.cpp54
-rw-r--r--src/kconfig_compiler/KConfigCodeGeneratorBase.h3
-rw-r--r--src/kconfig_compiler/KConfigCommonStructs.h1
-rw-r--r--src/kconfig_compiler/KConfigHeaderGenerator.cpp44
-rw-r--r--src/kconfig_compiler/KConfigHeaderGenerator.h2
-rw-r--r--src/kconfig_compiler/KConfigSourceGenerator.cpp15
-rw-r--r--src/kconfig_compiler/KConfigSourceGenerator.h1
-rw-r--r--src/kconfig_compiler/kconfig_compiler.cpp12
33 files changed, 1195 insertions, 129 deletions
diff --git a/autotests/kconfig_compiler/test1.h.ref b/autotests/kconfig_compiler/test1.h.ref
index 52921ac6..24500176 100644
--- a/autotests/kconfig_compiler/test1.h.ref
+++ b/autotests/kconfig_compiler/test1.h.ref
@@ -26,7 +26,7 @@ class Test1 : public KConfigSkeleton
*/
void setOneOption( bool v )
{
- if (!isImmutable( QStringLiteral( "OneOption" ) ))
+ if (!isOneOptionImmutable())
mOneOption = v;
}
@@ -39,11 +39,19 @@ class Test1 : public KConfigSkeleton
}
/**
+ Is One option Immutable
+ */
+ bool isOneOptionImmutable() const
+ {
+ return isImmutable( QStringLiteral( "OneOption" ) );
+ }
+
+ /**
Set Another option
*/
void setAnotherOption( int v )
{
- if (!isImmutable( QStringLiteral( "AnotherOption" ) ))
+ if (!isAnotherOptionImmutable())
mAnotherOption = v;
}
@@ -56,11 +64,19 @@ class Test1 : public KConfigSkeleton
}
/**
+ Is Another option Immutable
+ */
+ bool isAnotherOptionImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AnotherOption" ) );
+ }
+
+ /**
Set This is some funky option
*/
void setListOption( int v )
{
- if (!isImmutable( QStringLiteral( "ListOption" ) ))
+ if (!isListOptionImmutable())
mListOption = v;
}
@@ -73,11 +89,19 @@ class Test1 : public KConfigSkeleton
}
/**
+ Is This is some funky option Immutable
+ */
+ bool isListOptionImmutable() const
+ {
+ return isImmutable( QStringLiteral( "ListOption" ) );
+ }
+
+ /**
Set This is a string
*/
void setMyString( const QString & v )
{
- if (!isImmutable( QStringLiteral( "MyString" ) ))
+ if (!isMyStringImmutable())
mMyString = v;
}
@@ -90,11 +114,19 @@ class Test1 : public KConfigSkeleton
}
/**
+ Is This is a string Immutable
+ */
+ bool isMyStringImmutable() const
+ {
+ return isImmutable( QStringLiteral( "MyString" ) );
+ }
+
+ /**
Set This is a path
*/
void setMyPath( const QString & v )
{
- if (!isImmutable( QStringLiteral( "MyPath" ) ))
+ if (!isMyPathImmutable())
mMyPath = v;
}
@@ -107,11 +139,19 @@ class Test1 : public KConfigSkeleton
}
/**
+ Is This is a path Immutable
+ */
+ bool isMyPathImmutable() const
+ {
+ return isImmutable( QStringLiteral( "MyPath" ) );
+ }
+
+ /**
Set Another option
*/
void setAnotherOption2( int v )
{
- if (!isImmutable( QStringLiteral( "AnotherOption2" ) ))
+ if (!isAnotherOption2Immutable())
mAnotherOption2 = v;
}
@@ -124,11 +164,19 @@ class Test1 : public KConfigSkeleton
}
/**
+ Is Another option Immutable
+ */
+ bool isAnotherOption2Immutable() const
+ {
+ return isImmutable( QStringLiteral( "AnotherOption2" ) );
+ }
+
+ /**
Set MyStringList
*/
void setMyStringList( const QStringList & v )
{
- if (!isImmutable( QStringLiteral( "MyStringList" ) ))
+ if (!isMyStringListImmutable())
mMyStringList = v;
}
@@ -141,11 +189,19 @@ class Test1 : public KConfigSkeleton
}
/**
+ Is MyStringList Immutable
+ */
+ bool isMyStringListImmutable() const
+ {
+ return isImmutable( QStringLiteral( "MyStringList" ) );
+ }
+
+ /**
Set MyStringListHidden
*/
void setMyStringListHidden( const QStringList & v )
{
- if (!isImmutable( QStringLiteral( "MyStringListHidden" ) ))
+ if (!isMyStringListHiddenImmutable())
mMyStringListHidden = v;
}
@@ -158,11 +214,19 @@ class Test1 : public KConfigSkeleton
}
/**
+ Is MyStringListHidden Immutable
+ */
+ bool isMyStringListHiddenImmutable() const
+ {
+ return isImmutable( QStringLiteral( "MyStringListHidden" ) );
+ }
+
+ /**
Set List Number
*/
void setMyNumber( int v )
{
- if (!isImmutable( QStringLiteral( "MyNumber" ) ))
+ if (!isMyNumberImmutable())
mMyNumber = v;
}
@@ -174,6 +238,14 @@ class Test1 : public KConfigSkeleton
return mMyNumber;
}
+ /**
+ Is List Number Immutable
+ */
+ bool isMyNumberImmutable() const
+ {
+ return isImmutable( QStringLiteral( "MyNumber" ) );
+ }
+
protected:
QString mParamtransport;
QString mParamfolder;
diff --git a/autotests/kconfig_compiler/test10.h.ref b/autotests/kconfig_compiler/test10.h.ref
index 82bbab84..a06bd162 100644
--- a/autotests/kconfig_compiler/test10.h.ref
+++ b/autotests/kconfig_compiler/test10.h.ref
@@ -24,6 +24,15 @@ class Test10 : public KConfigSkeleton
}
/**
+ Is foo bar Immutable
+ */
+ static
+ bool isFooBarImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "FooBar" ) );
+ }
+
+ /**
Get bar foo
*/
static
@@ -32,6 +41,15 @@ class Test10 : public KConfigSkeleton
return self()->mBarFoo;
}
+ /**
+ Is bar foo Immutable
+ */
+ static
+ bool isBarFooImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "BarFoo" ) );
+ }
+
protected:
Test10();
friend class Test10Helper;
diff --git a/autotests/kconfig_compiler/test11.h.ref b/autotests/kconfig_compiler/test11.h.ref
index 2acbe9e5..786858dc 100644
--- a/autotests/kconfig_compiler/test11.h.ref
+++ b/autotests/kconfig_compiler/test11.h.ref
@@ -30,7 +30,7 @@ class Test11 : public MyPrefs
*/
void setAutoSave( bool v )
{
- if (!isImmutable( QStringLiteral( "AutoSave" ) ))
+ if (!isAutoSaveImmutable())
mAutoSave = v;
}
@@ -43,6 +43,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Enable automatic saving of calendar Immutable
+ */
+ bool isAutoSaveImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSave" ) );
+ }
+
+ /**
Get Enable automatic saving of calendar default value
*/
bool defaultAutoSaveValue() const
@@ -63,7 +71,7 @@ class Test11 : public MyPrefs
*/
void setAutoSaveInterval( int v )
{
- if (!isImmutable( QStringLiteral( "AutoSaveInterval" ) ))
+ if (!isAutoSaveIntervalImmutable())
mAutoSaveInterval = v;
}
@@ -76,6 +84,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Auto Save Interval Immutable
+ */
+ bool isAutoSaveIntervalImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSaveInterval" ) );
+ }
+
+ /**
Get Auto Save Interval default value
*/
int defaultAutoSaveIntervalValue() const
@@ -96,7 +112,7 @@ class Test11 : public MyPrefs
*/
void setConfirm( bool v )
{
- if (!isImmutable( QStringLiteral( "Confirm" ) ))
+ if (!isConfirmImmutable())
mConfirm = v;
}
@@ -109,6 +125,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Confirm deletes Immutable
+ */
+ bool isConfirmImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Confirm" ) );
+ }
+
+ /**
Get Confirm deletes default value
*/
bool defaultConfirmValue() const
@@ -129,7 +153,7 @@ class Test11 : public MyPrefs
*/
void setArchiveFile( const QString & v )
{
- if (!isImmutable( QStringLiteral( "ArchiveFile" ) ))
+ if (!isArchiveFileImmutable())
mArchiveFile = v;
}
@@ -142,6 +166,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Archive File Immutable
+ */
+ bool isArchiveFileImmutable() const
+ {
+ return isImmutable( QStringLiteral( "ArchiveFile" ) );
+ }
+
+ /**
Get Item object corresponding to ArchiveFile()
*/
ItemString *archiveFileItem()
@@ -154,7 +186,7 @@ class Test11 : public MyPrefs
*/
void setDestination( EnumDestination::type v )
{
- if (!isImmutable( QStringLiteral( "Destination" ) ))
+ if (!isDestinationImmutable())
mDestination = v;
}
@@ -167,6 +199,14 @@ class Test11 : public MyPrefs
}
/**
+ Is New Events/Todos Should Immutable
+ */
+ bool isDestinationImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Destination" ) );
+ }
+
+ /**
Get New Events/Todos Should default value
*/
EnumDestination::type defaultDestinationValue() const
@@ -187,7 +227,7 @@ class Test11 : public MyPrefs
*/
void setHourSize( int v )
{
- if (!isImmutable( QStringLiteral( "HourSize" ) ))
+ if (!isHourSizeImmutable())
mHourSize = v;
}
@@ -200,6 +240,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Hour Size Immutable
+ */
+ bool isHourSizeImmutable() const
+ {
+ return isImmutable( QStringLiteral( "HourSize" ) );
+ }
+
+ /**
Get Hour Size default value
*/
int defaultHourSizeValue() const
@@ -220,7 +268,7 @@ class Test11 : public MyPrefs
*/
void setSelectionStartsEditor( bool v )
{
- if (!isImmutable( QStringLiteral( "SelectionStartsEditor" ) ))
+ if (!isSelectionStartsEditorImmutable())
mSelectionStartsEditor = v;
}
@@ -233,6 +281,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Time range selection in agenda view starts event editor Immutable
+ */
+ bool isSelectionStartsEditorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "SelectionStartsEditor" ) );
+ }
+
+ /**
Get Time range selection in agenda view starts event editor default value
*/
bool defaultSelectionStartsEditorValue() const
@@ -253,7 +309,7 @@ class Test11 : public MyPrefs
*/
void setSelectedPlugins( const QStringList & v )
{
- if (!isImmutable( QStringLiteral( "SelectedPlugins" ) ))
+ if (!isSelectedPluginsImmutable())
mSelectedPlugins = v;
}
@@ -266,6 +322,14 @@ class Test11 : public MyPrefs
}
/**
+ Is SelectedPlugins Immutable
+ */
+ bool isSelectedPluginsImmutable() const
+ {
+ return isImmutable( QStringLiteral( "SelectedPlugins" ) );
+ }
+
+ /**
Get SelectedPlugins default value
*/
QStringList defaultSelectedPluginsValue() const
@@ -286,7 +350,7 @@ class Test11 : public MyPrefs
*/
void setHighlightColor( const QColor & v )
{
- if (!isImmutable( QStringLiteral( "HighlightColor" ) ))
+ if (!isHighlightColorImmutable())
mHighlightColor = v;
}
@@ -299,6 +363,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Highlight color Immutable
+ */
+ bool isHighlightColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "HighlightColor" ) );
+ }
+
+ /**
Get Highlight color default value
*/
QColor defaultHighlightColorValue() const
@@ -319,7 +391,7 @@ class Test11 : public MyPrefs
*/
void setAgendaBgColor( const QColor & v )
{
- if (!isImmutable( QStringLiteral( "AgendaBgColor" ) ))
+ if (!isAgendaBgColorImmutable())
mAgendaBgColor = v;
}
@@ -332,6 +404,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Agenda view background color Immutable
+ */
+ bool isAgendaBgColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AgendaBgColor" ) );
+ }
+
+ /**
Get Agenda view background color default value
*/
QColor defaultAgendaBgColorValue() const
@@ -352,7 +432,7 @@ class Test11 : public MyPrefs
*/
void setTimeBarFont( const QFont & v )
{
- if (!isImmutable( QStringLiteral( "TimeBarFont" ) ))
+ if (!isTimeBarFontImmutable())
mTimeBarFont = v;
}
@@ -365,6 +445,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Time bar Immutable
+ */
+ bool isTimeBarFontImmutable() const
+ {
+ return isImmutable( QStringLiteral( "TimeBarFont" ) );
+ }
+
+ /**
Get Item object corresponding to TimeBarFont()
*/
ItemFont *timeBarFontItem()
@@ -377,7 +465,7 @@ class Test11 : public MyPrefs
*/
void setEmailClient( MailClient v )
{
- if (!isImmutable( QStringLiteral( "EmailClient" ) ))
+ if (!isEmailClientImmutable())
mEmailClient = v;
}
@@ -390,6 +478,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Email client Immutable
+ */
+ bool isEmailClientImmutable() const
+ {
+ return isImmutable( QStringLiteral( "EmailClient" ) );
+ }
+
+ /**
Get Email client default value
*/
MailClient defaultEmailClientValue() const
@@ -410,7 +506,7 @@ class Test11 : public MyPrefs
*/
void setDefaultReminderUnits( TimePeriod::Units v )
{
- if (!isImmutable( QStringLiteral( "DefaultReminderUnits" ) ))
+ if (!isDefaultReminderUnitsImmutable())
mDefaultReminderUnits = v;
}
@@ -423,6 +519,14 @@ class Test11 : public MyPrefs
}
/**
+ Is Reminder units Immutable
+ */
+ bool isDefaultReminderUnitsImmutable() const
+ {
+ return isImmutable( QStringLiteral( "DefaultReminderUnits" ) );
+ }
+
+ /**
Get Reminder units default value
*/
TimePeriod::Units defaultDefaultReminderUnitsValue() const
@@ -443,7 +547,7 @@ class Test11 : public MyPrefs
*/
void setQueueRate( int i, const QList<int> & v )
{
- if (!isImmutable( QStringLiteral( "queueRate%1" ).arg( i ) ))
+ if (!isQueueRateImmutable( i ))
mQueueRate[i] = v;
}
@@ -456,6 +560,14 @@ class Test11 : public MyPrefs
}
/**
+ Is EmptyingRate $(QueueIndex) Immutable
+ */
+ bool isQueueRateImmutable( int i ) const
+ {
+ return isImmutable( QStringLiteral( "queueRate%1" ).arg( i ) );
+ }
+
+ /**
Get EmptyingRate $(QueueIndex) default value
*/
QList<int> defaultQueueRateValue( int i ) const
@@ -476,7 +588,7 @@ class Test11 : public MyPrefs
*/
void setShowQueueTuner( bool v )
{
- if (!isImmutable( QStringLiteral( "ShowQueueTuner" ) ))
+ if (!isShowQueueTunerImmutable())
mShowQueueTuner = v;
}
@@ -489,6 +601,14 @@ class Test11 : public MyPrefs
}
/**
+ Is ShowQueueTuner Immutable
+ */
+ bool isShowQueueTunerImmutable() const
+ {
+ return isImmutable( QStringLiteral( "ShowQueueTuner" ) );
+ }
+
+ /**
Get ShowQueueTuner default value
*/
bool defaultShowQueueTunerValue() const
diff --git a/autotests/kconfig_compiler/test11a.h.ref b/autotests/kconfig_compiler/test11a.h.ref
index 62b59381..014501cd 100644
--- a/autotests/kconfig_compiler/test11a.h.ref
+++ b/autotests/kconfig_compiler/test11a.h.ref
@@ -30,7 +30,7 @@ class Test11a : public MyPrefs
*/
void setAutoSave( bool v )
{
- if (!isImmutable( QStringLiteral( "AutoSave" ) ))
+ if (!isAutoSaveImmutable())
mAutoSave = v;
}
@@ -43,6 +43,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Enable automatic saving of calendar Immutable
+ */
+ bool isAutoSaveImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSave" ) );
+ }
+
+ /**
Get Item object corresponding to AutoSave()
*/
ItemBool *autoSaveItem()
@@ -55,7 +63,7 @@ class Test11a : public MyPrefs
*/
void setAutoSaveInterval( int v )
{
- if (!isImmutable( QStringLiteral( "AutoSaveInterval" ) ))
+ if (!isAutoSaveIntervalImmutable())
mAutoSaveInterval = v;
}
@@ -68,6 +76,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Auto Save Interval Immutable
+ */
+ bool isAutoSaveIntervalImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSaveInterval" ) );
+ }
+
+ /**
Get Item object corresponding to AutoSaveInterval()
*/
ItemInt *autoSaveIntervalItem()
@@ -80,7 +96,7 @@ class Test11a : public MyPrefs
*/
void setConfirm( bool v )
{
- if (!isImmutable( QStringLiteral( "Confirm" ) ))
+ if (!isConfirmImmutable())
mConfirm = v;
}
@@ -93,6 +109,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Confirm deletes Immutable
+ */
+ bool isConfirmImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Confirm" ) );
+ }
+
+ /**
Get Item object corresponding to Confirm()
*/
ItemBool *confirmItem()
@@ -105,7 +129,7 @@ class Test11a : public MyPrefs
*/
void setArchiveFile( const QString & v )
{
- if (!isImmutable( QStringLiteral( "ArchiveFile" ) ))
+ if (!isArchiveFileImmutable())
mArchiveFile = v;
}
@@ -118,6 +142,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Archive File Immutable
+ */
+ bool isArchiveFileImmutable() const
+ {
+ return isImmutable( QStringLiteral( "ArchiveFile" ) );
+ }
+
+ /**
Get Item object corresponding to ArchiveFile()
*/
ItemString *archiveFileItem()
@@ -130,7 +162,7 @@ class Test11a : public MyPrefs
*/
void setDestination( EnumDestination::type v )
{
- if (!isImmutable( QStringLiteral( "Destination" ) ))
+ if (!isDestinationImmutable())
mDestination = v;
}
@@ -143,6 +175,14 @@ class Test11a : public MyPrefs
}
/**
+ Is New Events/Todos Should Immutable
+ */
+ bool isDestinationImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Destination" ) );
+ }
+
+ /**
Get New Events/Todos Should default value
*/
EnumDestination::type defaultDestinationValue() const
@@ -163,7 +203,7 @@ class Test11a : public MyPrefs
*/
void setHourSize( int v )
{
- if (!isImmutable( QStringLiteral( "HourSize" ) ))
+ if (!isHourSizeImmutable())
mHourSize = v;
}
@@ -176,6 +216,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Hour Size Immutable
+ */
+ bool isHourSizeImmutable() const
+ {
+ return isImmutable( QStringLiteral( "HourSize" ) );
+ }
+
+ /**
Get Item object corresponding to HourSize()
*/
ItemInt *hourSizeItem()
@@ -188,7 +236,7 @@ class Test11a : public MyPrefs
*/
void setSelectionStartsEditor( bool v )
{
- if (!isImmutable( QStringLiteral( "SelectionStartsEditor" ) ))
+ if (!isSelectionStartsEditorImmutable())
mSelectionStartsEditor = v;
}
@@ -201,6 +249,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Time range selection in agenda view starts event editor Immutable
+ */
+ bool isSelectionStartsEditorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "SelectionStartsEditor" ) );
+ }
+
+ /**
Get Time range selection in agenda view starts event editor default value
*/
bool defaultSelectionStartsEditorValue() const
@@ -221,7 +277,7 @@ class Test11a : public MyPrefs
*/
void setSelectedPlugins( const QStringList & v )
{
- if (!isImmutable( QStringLiteral( "SelectedPlugins" ) ))
+ if (!isSelectedPluginsImmutable())
mSelectedPlugins = v;
}
@@ -234,6 +290,14 @@ class Test11a : public MyPrefs
}
/**
+ Is SelectedPlugins Immutable
+ */
+ bool isSelectedPluginsImmutable() const
+ {
+ return isImmutable( QStringLiteral( "SelectedPlugins" ) );
+ }
+
+ /**
Get Item object corresponding to SelectedPlugins()
*/
ItemStringList *selectedPluginsItem()
@@ -246,7 +310,7 @@ class Test11a : public MyPrefs
*/
void setHighlightColor( const QColor & v )
{
- if (!isImmutable( QStringLiteral( "HighlightColor" ) ))
+ if (!isHighlightColorImmutable())
mHighlightColor = v;
}
@@ -259,6 +323,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Highlight color Immutable
+ */
+ bool isHighlightColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "HighlightColor" ) );
+ }
+
+ /**
Get Item object corresponding to HighlightColor()
*/
ItemColor *highlightColorItem()
@@ -271,7 +343,7 @@ class Test11a : public MyPrefs
*/
void setAgendaBgColor( const QColor & v )
{
- if (!isImmutable( QStringLiteral( "AgendaBgColor" ) ))
+ if (!isAgendaBgColorImmutable())
mAgendaBgColor = v;
}
@@ -284,6 +356,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Agenda view background color Immutable
+ */
+ bool isAgendaBgColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AgendaBgColor" ) );
+ }
+
+ /**
Get Item object corresponding to AgendaBgColor()
*/
ItemColor *agendaBgColorItem()
@@ -296,7 +376,7 @@ class Test11a : public MyPrefs
*/
void setTimeBarFont( const QFont & v )
{
- if (!isImmutable( QStringLiteral( "TimeBarFont" ) ))
+ if (!isTimeBarFontImmutable())
mTimeBarFont = v;
}
@@ -309,6 +389,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Time bar Immutable
+ */
+ bool isTimeBarFontImmutable() const
+ {
+ return isImmutable( QStringLiteral( "TimeBarFont" ) );
+ }
+
+ /**
Get Item object corresponding to TimeBarFont()
*/
ItemFont *timeBarFontItem()
@@ -321,7 +409,7 @@ class Test11a : public MyPrefs
*/
void setEmailClient( MailClient v )
{
- if (!isImmutable( QStringLiteral( "EmailClient" ) ))
+ if (!isEmailClientImmutable())
mEmailClient = v;
}
@@ -334,6 +422,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Email client Immutable
+ */
+ bool isEmailClientImmutable() const
+ {
+ return isImmutable( QStringLiteral( "EmailClient" ) );
+ }
+
+ /**
Get Item object corresponding to EmailClient()
*/
ItemEnum *emailClientItem()
@@ -346,7 +442,7 @@ class Test11a : public MyPrefs
*/
void setDefaultReminderUnits( TimePeriod::Units v )
{
- if (!isImmutable( QStringLiteral( "DefaultReminderUnits" ) ))
+ if (!isDefaultReminderUnitsImmutable())
mDefaultReminderUnits = v;
}
@@ -359,6 +455,14 @@ class Test11a : public MyPrefs
}
/**
+ Is Reminder units Immutable
+ */
+ bool isDefaultReminderUnitsImmutable() const
+ {
+ return isImmutable( QStringLiteral( "DefaultReminderUnits" ) );
+ }
+
+ /**
Get Reminder units default value
*/
TimePeriod::Units defaultDefaultReminderUnitsValue() const
@@ -379,7 +483,7 @@ class Test11a : public MyPrefs
*/
void setQueueRate( int i, const QList<int> & v )
{
- if (!isImmutable( QStringLiteral( "queueRate%1" ).arg( i ) ))
+ if (!isQueueRateImmutable( i ))
mQueueRate[i] = v;
}
@@ -392,6 +496,14 @@ class Test11a : public MyPrefs
}
/**
+ Is EmptyingRate $(QueueIndex) Immutable
+ */
+ bool isQueueRateImmutable( int i ) const
+ {
+ return isImmutable( QStringLiteral( "queueRate%1" ).arg( i ) );
+ }
+
+ /**
Get Item object corresponding to queueRate()
*/
ItemIntList *queueRateItem( int i )
@@ -404,7 +516,7 @@ class Test11a : public MyPrefs
*/
void setShowQueueTuner( bool v )
{
- if (!isImmutable( QStringLiteral( "ShowQueueTuner" ) ))
+ if (!isShowQueueTunerImmutable())
mShowQueueTuner = v;
}
@@ -417,6 +529,14 @@ class Test11a : public MyPrefs
}
/**
+ Is ShowQueueTuner Immutable
+ */
+ bool isShowQueueTunerImmutable() const
+ {
+ return isImmutable( QStringLiteral( "ShowQueueTuner" ) );
+ }
+
+ /**
Get Item object corresponding to ShowQueueTuner()
*/
ItemBool *showQueueTunerItem()
diff --git a/autotests/kconfig_compiler/test12.h.ref b/autotests/kconfig_compiler/test12.h.ref
index e3954282..cd4c188e 100644
--- a/autotests/kconfig_compiler/test12.h.ref
+++ b/autotests/kconfig_compiler/test12.h.ref
@@ -23,6 +23,14 @@ class Test12 : public KConfigSkeleton
return mRnRSource;
}
+ /**
+ Is RnRSource Immutable
+ */
+ bool isRnRSourceImmutable() const
+ {
+ return isImmutable( QStringLiteral( "RnRSource" ) );
+ }
+
protected:
// muon
diff --git a/autotests/kconfig_compiler/test13.h.ref b/autotests/kconfig_compiler/test13.h.ref
index 3a6e7f89..6dad0e57 100644
--- a/autotests/kconfig_compiler/test13.h.ref
+++ b/autotests/kconfig_compiler/test13.h.ref
@@ -17,6 +17,7 @@ class Test13 : public KConfigSkeleton
~Test13();
Q_PROPERTY(QUrl picturesDir READ picturesDir CONSTANT)
+ Q_PROPERTY(bool isPicturesDirImmutable CONSTANT)
/**
Get picturesDir
*/
@@ -26,17 +27,26 @@ class Test13 : public KConfigSkeleton
}
/**
+ Is picturesDir Immutable
+ */
+ bool isPicturesDirImmutable() const
+ {
+ return isImmutable( QStringLiteral( "picturesDir" ) );
+ }
+
+ /**
Set brightness
*/
void setBrightness( double v )
{
- if (v != mBrightness && !isImmutable( QStringLiteral( "brightness" ) )) {
+ if (v != mBrightness && !isBrightnessImmutable()) {
mBrightness = v;
Q_EMIT brightnessChanged();
}
}
Q_PROPERTY(double brightness READ brightness WRITE setBrightness NOTIFY brightnessChanged)
+ Q_PROPERTY(bool isBrightnessImmutable CONSTANT)
/**
Get brightness
*/
@@ -45,7 +55,16 @@ class Test13 : public KConfigSkeleton
return mBrightness;
}
+ /**
+ Is brightness Immutable
+ */
+ bool isBrightnessImmutable() const
+ {
+ return isImmutable( QStringLiteral( "brightness" ) );
+ }
+
Q_PROPERTY(bool startsWithUppercase READ startsWithUppercase CONSTANT)
+ Q_PROPERTY(bool isStartsWithUppercaseImmutable CONSTANT)
/**
Get StartsWithUppercase
*/
@@ -54,6 +73,14 @@ class Test13 : public KConfigSkeleton
return mStartsWithUppercase;
}
+ /**
+ Is StartsWithUppercase Immutable
+ */
+ bool isStartsWithUppercaseImmutable() const
+ {
+ return isImmutable( QStringLiteral( "StartsWithUppercase" ) );
+ }
+
enum {
signalBrightnessChanged = 0x1
diff --git a/autotests/kconfig_compiler/test2.h.ref b/autotests/kconfig_compiler/test2.h.ref
index ce7ff259..75d850d7 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( QStringLiteral( "AutoSave" ) ))
+ if (!isAutoSaveImmutable())
mAutoSave = v;
}
@@ -36,6 +36,14 @@ class Test2 : public MyPrefs
}
/**
+ Is Enable automatic saving of calendar Immutable
+ */
+ bool isAutoSaveImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSave" ) );
+ }
+
+ /**
Get Item object corresponding to AutoSave()
*/
ItemBool *autoSaveItem()
@@ -48,7 +56,7 @@ class Test2 : public MyPrefs
*/
void setAutoSaveInterval( int v )
{
- if (!isImmutable( QStringLiteral( "AutoSaveInterval" ) ))
+ if (!isAutoSaveIntervalImmutable())
mAutoSaveInterval = v;
}
@@ -61,6 +69,14 @@ class Test2 : public MyPrefs
}
/**
+ Is Auto Save Interval Immutable
+ */
+ bool isAutoSaveIntervalImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSaveInterval" ) );
+ }
+
+ /**
Get Item object corresponding to AutoSaveInterval()
*/
ItemInt *autoSaveIntervalItem()
@@ -73,7 +89,7 @@ class Test2 : public MyPrefs
*/
void setConfirm( bool v )
{
- if (!isImmutable( QStringLiteral( "Confirm" ) ))
+ if (!isConfirmImmutable())
mConfirm = v;
}
@@ -86,6 +102,14 @@ class Test2 : public MyPrefs
}
/**
+ Is Confirm deletes Immutable
+ */
+ bool isConfirmImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Confirm" ) );
+ }
+
+ /**
Get Item object corresponding to Confirm()
*/
ItemBool *confirmItem()
@@ -98,7 +122,7 @@ class Test2 : public MyPrefs
*/
void setArchiveFile( const QString & v )
{
- if (!isImmutable( QStringLiteral( "ArchiveFile" ) ))
+ if (!isArchiveFileImmutable())
mArchiveFile = v;
}
@@ -111,6 +135,14 @@ class Test2 : public MyPrefs
}
/**
+ Is Archive File Immutable
+ */
+ bool isArchiveFileImmutable() const
+ {
+ return isImmutable( QStringLiteral( "ArchiveFile" ) );
+ }
+
+ /**
Get Item object corresponding to ArchiveFile()
*/
ItemString *archiveFileItem()
@@ -123,7 +155,7 @@ class Test2 : public MyPrefs
*/
void setDestination( int v )
{
- if (!isImmutable( QStringLiteral( "Destination" ) ))
+ if (!isDestinationImmutable())
mDestination = v;
}
@@ -136,6 +168,14 @@ class Test2 : public MyPrefs
}
/**
+ Is New Events/Todos Should Immutable
+ */
+ bool isDestinationImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Destination" ) );
+ }
+
+ /**
Get Item object corresponding to Destination()
*/
ItemEnum *destinationItem()
@@ -148,7 +188,7 @@ class Test2 : public MyPrefs
*/
void setHourSize( int v )
{
- if (!isImmutable( QStringLiteral( "HourSize" ) ))
+ if (!isHourSizeImmutable())
mHourSize = v;
}
@@ -161,6 +201,14 @@ class Test2 : public MyPrefs
}
/**
+ Is Hour Size Immutable
+ */
+ bool isHourSizeImmutable() const
+ {
+ return isImmutable( QStringLiteral( "HourSize" ) );
+ }
+
+ /**
Get Item object corresponding to HourSize()
*/
ItemInt *hourSizeItem()
@@ -173,7 +221,7 @@ class Test2 : public MyPrefs
*/
void setSelectionStartsEditor( bool v )
{
- if (!isImmutable( QStringLiteral( "SelectionStartsEditor" ) ))
+ if (!isSelectionStartsEditorImmutable())
mSelectionStartsEditor = v;
}
@@ -186,6 +234,14 @@ class Test2 : public MyPrefs
}
/**
+ Is Time range selection in agenda view starts event editor Immutable
+ */
+ bool isSelectionStartsEditorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "SelectionStartsEditor" ) );
+ }
+
+ /**
Get Item object corresponding to SelectionStartsEditor()
*/
ItemBool *selectionStartsEditorItem()
@@ -198,7 +254,7 @@ class Test2 : public MyPrefs
*/
void setSelectedPlugins( const QStringList & v )
{
- if (!isImmutable( QStringLiteral( "SelectedPlugins" ) ))
+ if (!isSelectedPluginsImmutable())
mSelectedPlugins = v;
}
@@ -211,6 +267,14 @@ class Test2 : public MyPrefs
}
/**
+ Is SelectedPlugins Immutable
+ */
+ bool isSelectedPluginsImmutable() const
+ {
+ return isImmutable( QStringLiteral( "SelectedPlugins" ) );
+ }
+
+ /**
Get Item object corresponding to SelectedPlugins()
*/
ItemStringList *selectedPluginsItem()
@@ -223,7 +287,7 @@ class Test2 : public MyPrefs
*/
void setHighlightColor( const QColor & v )
{
- if (!isImmutable( QStringLiteral( "HighlightColor" ) ))
+ if (!isHighlightColorImmutable())
mHighlightColor = v;
}
@@ -236,6 +300,14 @@ class Test2 : public MyPrefs
}
/**
+ Is Highlight color Immutable
+ */
+ bool isHighlightColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "HighlightColor" ) );
+ }
+
+ /**
Get Item object corresponding to HighlightColor()
*/
ItemColor *highlightColorItem()
@@ -248,7 +320,7 @@ class Test2 : public MyPrefs
*/
void setAgendaBgColor( const QColor & v )
{
- if (!isImmutable( QStringLiteral( "AgendaBgColor" ) ))
+ if (!isAgendaBgColorImmutable())
mAgendaBgColor = v;
}
@@ -261,6 +333,14 @@ class Test2 : public MyPrefs
}
/**
+ Is Agenda view background color Immutable
+ */
+ bool isAgendaBgColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AgendaBgColor" ) );
+ }
+
+ /**
Get Item object corresponding to AgendaBgColor()
*/
ItemColor *agendaBgColorItem()
@@ -273,7 +353,7 @@ class Test2 : public MyPrefs
*/
void setTimeBarFont( const QFont & v )
{
- if (!isImmutable( QStringLiteral( "TimeBarFont" ) ))
+ if (!isTimeBarFontImmutable())
mTimeBarFont = v;
}
@@ -286,6 +366,14 @@ class Test2 : public MyPrefs
}
/**
+ Is Time bar Immutable
+ */
+ bool isTimeBarFontImmutable() const
+ {
+ return isImmutable( QStringLiteral( "TimeBarFont" ) );
+ }
+
+ /**
Get Item object corresponding to TimeBarFont()
*/
ItemFont *timeBarFontItem()
diff --git a/autotests/kconfig_compiler/test3.h.ref b/autotests/kconfig_compiler/test3.h.ref
index 2b8ef539..7dde3de0 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( QStringLiteral( "AutoSave" ) ))
+ if (!isAutoSaveImmutable())
mAutoSave = v;
}
@@ -35,6 +35,14 @@ class Test3 : public KConfigSkeleton
}
/**
+ Is Enable automatic saving of calendar Immutable
+ */
+ bool isAutoSaveImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSave" ) );
+ }
+
+ /**
Get Item object corresponding to AutoSave()
*/
ItemBool *autoSaveItem()
@@ -47,7 +55,7 @@ class Test3 : public KConfigSkeleton
*/
void setBlubb( int v )
{
- if (!isImmutable( QStringLiteral( "Blubb" ) ))
+ if (!isBlubbImmutable())
mBlubb = v;
}
@@ -60,6 +68,14 @@ class Test3 : public KConfigSkeleton
}
/**
+ Is Blubb Immutable
+ */
+ bool isBlubbImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Blubb" ) );
+ }
+
+ /**
Get Item object corresponding to Blubb()
*/
ItemInt *blubbItem()
@@ -72,7 +88,7 @@ class Test3 : public KConfigSkeleton
*/
void setBlahBlah( const QString & v )
{
- if (!isImmutable( QStringLiteral( "BlahBlah" ) ))
+ if (!isBlahBlahImmutable())
mBlahBlah = v;
}
@@ -85,6 +101,14 @@ class Test3 : public KConfigSkeleton
}
/**
+ Is BlahBlah Immutable
+ */
+ bool isBlahBlahImmutable() const
+ {
+ return isImmutable( QStringLiteral( "BlahBlah" ) );
+ }
+
+ /**
Get Item object corresponding to BlahBlah()
*/
ItemString *blahBlahItem()
@@ -97,7 +121,7 @@ class Test3 : public KConfigSkeleton
*/
void setMyPassword( const QString & v )
{
- if (!isImmutable( QStringLiteral( "MyPassword" ) ))
+ if (!isMyPasswordImmutable())
mMyPassword = v;
}
@@ -110,6 +134,14 @@ class Test3 : public KConfigSkeleton
}
/**
+ Is MyPassword Immutable
+ */
+ bool isMyPasswordImmutable() const
+ {
+ return isImmutable( QStringLiteral( "MyPassword" ) );
+ }
+
+ /**
Get Item object corresponding to MyPassword()
*/
ItemPassword *myPasswordItem()
diff --git a/autotests/kconfig_compiler/test3a.h.ref b/autotests/kconfig_compiler/test3a.h.ref
index dbe009dc..3cdf1677 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( QStringLiteral( "AutoSave" ) ))
+ if (!isAutoSaveImmutable())
mAutoSave = v;
}
@@ -36,6 +36,14 @@ class Test3a : public KConfigSkeleton
}
/**
+ Is Enable automatic saving of calendar Immutable
+ */
+ bool isAutoSaveImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSave" ) );
+ }
+
+ /**
Get Item object corresponding to AutoSave()
*/
ItemBool *autoSaveItem()
@@ -48,7 +56,7 @@ class Test3a : public KConfigSkeleton
*/
void setBlubb( int v )
{
- if (!isImmutable( QStringLiteral( "Blubb" ) ))
+ if (!isBlubbImmutable())
mBlubb = v;
}
@@ -61,6 +69,14 @@ class Test3a : public KConfigSkeleton
}
/**
+ Is Blubb Immutable
+ */
+ bool isBlubbImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Blubb" ) );
+ }
+
+ /**
Get Item object corresponding to Blubb()
*/
ItemInt *blubbItem()
@@ -73,7 +89,7 @@ class Test3a : public KConfigSkeleton
*/
void setBlahBlah( const QString & v )
{
- if (!isImmutable( QStringLiteral( "BlahBlah" ) ))
+ if (!isBlahBlahImmutable())
mBlahBlah = v;
}
@@ -86,6 +102,14 @@ class Test3a : public KConfigSkeleton
}
/**
+ Is BlahBlah Immutable
+ */
+ bool isBlahBlahImmutable() const
+ {
+ return isImmutable( QStringLiteral( "BlahBlah" ) );
+ }
+
+ /**
Get Item object corresponding to BlahBlah()
*/
ItemString *blahBlahItem()
@@ -98,7 +122,7 @@ class Test3a : public KConfigSkeleton
*/
void setMyPassword( const QString & v )
{
- if (!isImmutable( QStringLiteral( "MyPassword" ) ))
+ if (!isMyPasswordImmutable())
mMyPassword = v;
}
@@ -111,6 +135,14 @@ class Test3a : public KConfigSkeleton
}
/**
+ Is MyPassword Immutable
+ */
+ bool isMyPasswordImmutable() const
+ {
+ return isImmutable( QStringLiteral( "MyPassword" ) );
+ }
+
+ /**
Get Item object corresponding to MyPassword()
*/
ItemPassword *myPasswordItem()
diff --git a/autotests/kconfig_compiler/test4.h.ref b/autotests/kconfig_compiler/test4.h.ref
index 1d5d1d87..32e351ca 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( QStringLiteral( "Color%1" ).arg( i ) ))
+ if (!self()->isColorImmutable( i ))
self()->mColor[i] = v;
}
@@ -45,12 +45,21 @@ class Test4 : public KConfigSkeleton
}
/**
+ Is Block colors. Immutable
+ */
+ static
+ bool isColorImmutable( int i )
+ {
+ return self()->isImmutable( QStringLiteral( "Color%1" ).arg( i ) );
+ }
+
+ /**
Set Mouse actions.
*/
static
void setMouseAction( int i, int v )
{
- if (!self()->isImmutable( QStringLiteral( "MouseAction%1" ).arg( QLatin1String( EnumButton::enumToString[i] ) ) ))
+ if (!self()->isMouseActionImmutable( i ))
self()->mMouseAction[i] = v;
}
@@ -64,12 +73,21 @@ class Test4 : public KConfigSkeleton
}
/**
+ Is Mouse actions. Immutable
+ */
+ static
+ bool isMouseActionImmutable( int i )
+ {
+ return self()->isImmutable( QStringLiteral( "MouseAction%1" ).arg( QLatin1String( EnumButton::enumToString[i] ) ) );
+ }
+
+ /**
Set Gray colors.
*/
static
void setGrayColor( int i, const QColor & v )
{
- if (!self()->isImmutable( QStringLiteral( "GrayColor%1" ).arg( i ) ))
+ if (!self()->isGrayColorImmutable( i ))
self()->mGrayColor[i] = v;
}
@@ -83,12 +101,21 @@ class Test4 : public KConfigSkeleton
}
/**
+ Is Gray colors. Immutable
+ */
+ static
+ bool isGrayColorImmutable( int i )
+ {
+ return self()->isImmutable( QStringLiteral( "GrayColor%1" ).arg( i ) );
+ }
+
+ /**
Set Gray colors as string.
*/
static
void setColorString( int i, const QString & v )
{
- if (!self()->isImmutable( QStringLiteral( "ColorString%1" ).arg( i ) ))
+ if (!self()->isColorStringImmutable( i ))
self()->mColorString[i] = v;
}
@@ -102,12 +129,21 @@ class Test4 : public KConfigSkeleton
}
/**
+ Is Gray colors as string. Immutable
+ */
+ static
+ bool isColorStringImmutable( int i )
+ {
+ return self()->isImmutable( QStringLiteral( "ColorString%1" ).arg( i ) );
+ }
+
+ /**
Set foo bar
*/
static
void setFooBar( const QString & v )
{
- if (!self()->isImmutable( QStringLiteral( "FooBar" ) ))
+ if (!self()->isFooBarImmutable())
self()->mFooBar = v;
}
@@ -121,6 +157,15 @@ class Test4 : public KConfigSkeleton
}
/**
+ Is foo bar Immutable
+ */
+ static
+ bool isFooBarImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "FooBar" ) );
+ }
+
+ /**
Set Age
*/
static
@@ -138,7 +183,7 @@ class Test4 : public KConfigSkeleton
v = 88;
}
- if (!self()->isImmutable( QStringLiteral( "Age" ) ))
+ if (!self()->isAgeImmutable())
self()->mAge = v;
}
@@ -151,6 +196,15 @@ class Test4 : public KConfigSkeleton
return self()->mAge;
}
+ /**
+ Is Age Immutable
+ */
+ static
+ bool isAgeImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "Age" ) );
+ }
+
protected:
Test4();
friend class Test4Helper;
diff --git a/autotests/kconfig_compiler/test5.h.ref b/autotests/kconfig_compiler/test5.h.ref
index 07049cab..96e5c143 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( QStringLiteral( "Color%1" ).arg( i ) ))
+ if (!self()->isColorImmutable( i ))
self()->mColor[i] = v;
}
@@ -37,12 +37,21 @@ class Test5 : public KConfigSkeleton
}
/**
+ Is Block colors. Immutable
+ */
+ static
+ bool isColorImmutable( int i )
+ {
+ return self()->isImmutable( QStringLiteral( "Color%1" ).arg( i ) );
+ }
+
+ /**
Set Mouse actions.
*/
static
void setMouseAction( int i, int v )
{
- if (!self()->isImmutable( QStringLiteral( "MouseAction%1" ).arg( QLatin1String( EnumButtonToString[i] ) ) ))
+ if (!self()->isMouseActionImmutable( i ))
self()->mMouseAction[i] = v;
}
@@ -56,12 +65,21 @@ class Test5 : public KConfigSkeleton
}
/**
+ Is Mouse actions. Immutable
+ */
+ static
+ bool isMouseActionImmutable( int i )
+ {
+ return self()->isImmutable( QStringLiteral( "MouseAction%1" ).arg( QLatin1String( EnumButtonToString[i] ) ) );
+ }
+
+ /**
Set foo bar
*/
static
void setFooBar( const QString & v )
{
- if (!self()->isImmutable( QStringLiteral( "FooBar" ) ))
+ if (!self()->isFooBarImmutable())
self()->mFooBar = v;
}
@@ -75,6 +93,15 @@ class Test5 : public KConfigSkeleton
}
/**
+ Is foo bar Immutable
+ */
+ static
+ bool isFooBarImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "FooBar" ) );
+ }
+
+ /**
Set Age
*/
static
@@ -92,7 +119,7 @@ class Test5 : public KConfigSkeleton
v = 88;
}
- if (!self()->isImmutable( QStringLiteral( "Age" ) ))
+ if (!self()->isAgeImmutable())
self()->mAge = v;
}
@@ -105,6 +132,15 @@ class Test5 : public KConfigSkeleton
return self()->mAge;
}
+ /**
+ Is Age Immutable
+ */
+ static
+ bool isAgeImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "Age" ) );
+ }
+
protected:
Test5(QObject *parent = nullptr);
friend class Test5Helper;
diff --git a/autotests/kconfig_compiler/test6.h.ref b/autotests/kconfig_compiler/test6.h.ref
index ddc435a1..6084e7dc 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( QStringLiteral( "Color" ) ))
+ if (!isColorImmutable())
mColor = v;
}
@@ -32,11 +32,19 @@ class Test6 : public KConfigSkeleton
}
/**
+ Is Block colors. Immutable
+ */
+ bool isColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Color" ) );
+ }
+
+ /**
Set foo bar
*/
void setFooBar( const QString & v )
{
- if (!isImmutable( QStringLiteral( "FooBar" ) ))
+ if (!isFooBarImmutable())
mFooBar = v;
}
@@ -49,6 +57,14 @@ class Test6 : public KConfigSkeleton
}
/**
+ Is foo bar Immutable
+ */
+ bool isFooBarImmutable() const
+ {
+ return isImmutable( QStringLiteral( "FooBar" ) );
+ }
+
+ /**
Set Age
*/
void setAge( int v )
@@ -65,7 +81,7 @@ class Test6 : public KConfigSkeleton
v = 88;
}
- if (!isImmutable( QStringLiteral( "Age" ) ))
+ if (!isAgeImmutable())
mAge = v;
}
@@ -77,6 +93,14 @@ class Test6 : public KConfigSkeleton
return mAge;
}
+ /**
+ Is Age Immutable
+ */
+ bool isAgeImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Age" ) );
+ }
+
protected:
QString mParamNumber;
diff --git a/autotests/kconfig_compiler/test7.h.ref b/autotests/kconfig_compiler/test7.h.ref
index a4eb12b5..c2dccf90 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( QStringLiteral( "Color" ) ))
+ if (!isColorImmutable())
mColor = v;
}
@@ -32,11 +32,19 @@ class Test7 : public KConfigSkeleton
}
/**
+ Is Block colors. Immutable
+ */
+ bool isColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Color" ) );
+ }
+
+ /**
Set foo bar
*/
void setFooBar( const QString & v )
{
- if (!isImmutable( QStringLiteral( "FooBar" ) ))
+ if (!isFooBarImmutable())
mFooBar = v;
}
@@ -49,6 +57,14 @@ class Test7 : public KConfigSkeleton
}
/**
+ Is foo bar Immutable
+ */
+ bool isFooBarImmutable() const
+ {
+ return isImmutable( QStringLiteral( "FooBar" ) );
+ }
+
+ /**
Set Age
*/
void setAge( int v )
@@ -65,7 +81,7 @@ class Test7 : public KConfigSkeleton
v = 88;
}
- if (!isImmutable( QStringLiteral( "Age" ) ))
+ if (!isAgeImmutable())
mAge = v;
}
@@ -77,6 +93,14 @@ class Test7 : public KConfigSkeleton
return mAge;
}
+ /**
+ Is Age Immutable
+ */
+ bool isAgeImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Age" ) );
+ }
+
protected:
int mParamNumber;
diff --git a/autotests/kconfig_compiler/test8a.h.ref b/autotests/kconfig_compiler/test8a.h.ref
index 3e890946..9e9c0f4e 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( QStringLiteral( "Font" ) ))
+ if (!isFontImmutable())
mFont = v;
}
@@ -33,11 +33,19 @@ class Test8a : public KConfigSkeleton
}
/**
+ Is Font Immutable
+ */
+ bool isFontImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Font" ) );
+ }
+
+ /**
Set TitleFont
*/
void setTitleFont( const QFont & v )
{
- if (!isImmutable( QStringLiteral( "TitleFont" ) ))
+ if (!isTitleFontImmutable())
mTitleFont = v;
}
@@ -49,6 +57,14 @@ class Test8a : public KConfigSkeleton
return mTitleFont;
}
+ /**
+ Is TitleFont Immutable
+ */
+ bool isTitleFontImmutable() const
+ {
+ return isImmutable( QStringLiteral( "TitleFont" ) );
+ }
+
protected:
// Group
diff --git a/autotests/kconfig_compiler/test8b.h.ref b/autotests/kconfig_compiler/test8b.h.ref
index 0f71ba7c..793c6851 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( QStringLiteral( "Something" ) ))
+ if (!self()->isSomethingImmutable())
self()->mSomething = v;
}
@@ -36,12 +36,21 @@ class Test8b : public Test8a
}
/**
+ Is Something Immutable
+ */
+ static
+ bool isSomethingImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "Something" ) );
+ }
+
+ /**
Set FooBoo
*/
static
void setFooBoo( bool v )
{
- if (!self()->isImmutable( QStringLiteral( "FooBoo" ) ))
+ if (!self()->isFooBooImmutable())
self()->mFooBoo = v;
}
@@ -55,12 +64,21 @@ class Test8b : public Test8a
}
/**
+ Is FooBoo Immutable
+ */
+ static
+ bool isFooBooImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "FooBoo" ) );
+ }
+
+ /**
Set Port
*/
static
void setPort( uint v )
{
- if (!self()->isImmutable( QStringLiteral( "Port" ) ))
+ if (!self()->isPortImmutable())
self()->mPort = v;
}
@@ -73,6 +91,15 @@ class Test8b : public Test8a
return self()->mPort;
}
+ /**
+ Is Port Immutable
+ */
+ static
+ bool isPortImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "Port" ) );
+ }
+
protected:
Test8b();
friend class Test8bHelper;
diff --git a/autotests/kconfig_compiler/test8c.h.ref b/autotests/kconfig_compiler/test8c.h.ref
index 57469dca..7e96da0b 100644
--- a/autotests/kconfig_compiler/test8c.h.ref
+++ b/autotests/kconfig_compiler/test8c.h.ref
@@ -22,7 +22,7 @@ class Test8c : public KConfigSkeleton
static
void setFont( const QFont & v )
{
- if (!self()->isImmutable( QStringLiteral( "Font" ) ))
+ if (!self()->isFontImmutable())
self()->mFont = v;
}
@@ -36,12 +36,21 @@ class Test8c : public KConfigSkeleton
}
/**
+ Is Font Immutable
+ */
+ static
+ bool isFontImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "Font" ) );
+ }
+
+ /**
Set TitleFont
*/
static
void setTitleFont( const QFont & v )
{
- if (!self()->isImmutable( QStringLiteral( "TitleFont" ) ))
+ if (!self()->isTitleFontImmutable())
self()->mTitleFont = v;
}
@@ -54,6 +63,15 @@ class Test8c : public KConfigSkeleton
return self()->mTitleFont;
}
+ /**
+ Is TitleFont Immutable
+ */
+ static
+ bool isTitleFontImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "TitleFont" ) );
+ }
+
protected:
Test8c(KSharedConfig::Ptr config, QObject *parent = nullptr);
friend class Test8cHelper;
diff --git a/autotests/kconfig_compiler/test9.h.ref b/autotests/kconfig_compiler/test9.h.ref
index 6e40cf48..7c95b1d1 100644
--- a/autotests/kconfig_compiler/test9.h.ref
+++ b/autotests/kconfig_compiler/test9.h.ref
@@ -21,7 +21,7 @@ class Test9 : public KConfigSkeleton
*/
void setMyStringList( const QStringList & v )
{
- if (!isImmutable( QStringLiteral( "MyStringList" ) ))
+ if (!isMyStringListImmutable())
mMyStringList = v;
}
@@ -34,11 +34,19 @@ class Test9 : public KConfigSkeleton
}
/**
+ Is MyStringList Immutable
+ */
+ bool isMyStringListImmutable() const
+ {
+ return isImmutable( QStringLiteral( "MyStringList" ) );
+ }
+
+ /**
Set This is a list of paths
*/
void setMyPathList( const QStringList & v )
{
- if (!isImmutable( QStringLiteral( "MyPathList" ) ))
+ if (!isMyPathListImmutable())
mMyPathList = v;
}
@@ -51,11 +59,19 @@ class Test9 : public KConfigSkeleton
}
/**
+ Is This is a list of paths Immutable
+ */
+ bool isMyPathListImmutable() const
+ {
+ return isImmutable( QStringLiteral( "MyPathList" ) );
+ }
+
+ /**
Set This is an additional test for PathList
*/
void setMyPathsList2( const QStringList & v )
{
- if (!isImmutable( QStringLiteral( "MyPathsList2" ) ))
+ if (!isMyPathsList2Immutable())
mMyPathsList2 = v;
}
@@ -67,6 +83,14 @@ class Test9 : public KConfigSkeleton
return mMyPathsList2;
}
+ /**
+ Is This is an additional test for PathList Immutable
+ */
+ bool isMyPathsList2Immutable() const
+ {
+ return isImmutable( QStringLiteral( "MyPathsList2" ) );
+ }
+
protected:
public:
QString mParamtransport;
diff --git a/autotests/kconfig_compiler/test_dpointer.cpp.ref b/autotests/kconfig_compiler/test_dpointer.cpp.ref
index 1bfb9f52..5693fb62 100644
--- a/autotests/kconfig_compiler/test_dpointer.cpp.ref
+++ b/autotests/kconfig_compiler/test_dpointer.cpp.ref
@@ -157,7 +157,7 @@ TestDPointer::TestDPointer( )
void TestDPointer::setAutoSave( bool v )
{
- if (!self()->isImmutable( QStringLiteral( "AutoSave" ) ))
+ if (!self()->TestDPointer::isAutoSaveImmutable())
self()->d->autoSave = v;
}
@@ -166,6 +166,11 @@ bool TestDPointer::autoSave()
return self()->d->autoSave;
}
+bool TestDPointer::isAutoSaveImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "AutoSave" ) );
+}
+
KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
{
@@ -174,7 +179,7 @@ KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
void TestDPointer::setAutoSaveInterval( int v )
{
- if (!self()->isImmutable( QStringLiteral( "AutoSaveInterval" ) ))
+ if (!self()->TestDPointer::isAutoSaveIntervalImmutable())
self()->d->autoSaveInterval = v;
}
@@ -183,6 +188,11 @@ int TestDPointer::autoSaveInterval()
return self()->d->autoSaveInterval;
}
+bool TestDPointer::isAutoSaveIntervalImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "AutoSaveInterval" ) );
+}
+
KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
{
@@ -191,7 +201,7 @@ KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
void TestDPointer::setConfirm( bool v )
{
- if (!self()->isImmutable( QStringLiteral( "Confirm" ) ))
+ if (!self()->TestDPointer::isConfirmImmutable())
self()->d->confirm = v;
}
@@ -200,6 +210,11 @@ bool TestDPointer::confirm()
return self()->d->confirm;
}
+bool TestDPointer::isConfirmImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "Confirm" ) );
+}
+
KConfigSkeleton::ItemBool *TestDPointer::confirmItem()
{
@@ -208,7 +223,7 @@ KConfigSkeleton::ItemBool *TestDPointer::confirmItem()
void TestDPointer::setArchiveFile( const QString & v )
{
- if (!self()->isImmutable( QStringLiteral( "ArchiveFile" ) ))
+ if (!self()->TestDPointer::isArchiveFileImmutable())
self()->d->archiveFile = v;
}
@@ -217,6 +232,11 @@ QString TestDPointer::archiveFile()
return self()->d->archiveFile;
}
+bool TestDPointer::isArchiveFileImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "ArchiveFile" ) );
+}
+
KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
{
@@ -225,7 +245,7 @@ KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
void TestDPointer::setDestination( int v )
{
- if (!self()->isImmutable( QStringLiteral( "Destination" ) ))
+ if (!self()->TestDPointer::isDestinationImmutable())
self()->d->destination = v;
}
@@ -234,6 +254,11 @@ int TestDPointer::destination()
return self()->d->destination;
}
+bool TestDPointer::isDestinationImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "Destination" ) );
+}
+
KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
{
@@ -242,7 +267,7 @@ KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
void TestDPointer::setHourSize( int v )
{
- if (!self()->isImmutable( QStringLiteral( "HourSize" ) ))
+ if (!self()->TestDPointer::isHourSizeImmutable())
self()->d->hourSize = v;
}
@@ -251,6 +276,11 @@ int TestDPointer::hourSize()
return self()->d->hourSize;
}
+bool TestDPointer::isHourSizeImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "HourSize" ) );
+}
+
KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
{
@@ -259,7 +289,7 @@ KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
void TestDPointer::setSelectionStartsEditor( bool v )
{
- if (!self()->isImmutable( QStringLiteral( "SelectionStartsEditor" ) ))
+ if (!self()->TestDPointer::isSelectionStartsEditorImmutable())
self()->d->selectionStartsEditor = v;
}
@@ -268,6 +298,11 @@ bool TestDPointer::selectionStartsEditor()
return self()->d->selectionStartsEditor;
}
+bool TestDPointer::isSelectionStartsEditorImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "SelectionStartsEditor" ) );
+}
+
KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
{
@@ -276,7 +311,7 @@ KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
void TestDPointer::setSelectedPlugins( const QStringList & v )
{
- if (!self()->isImmutable( QStringLiteral( "SelectedPlugins" ) ))
+ if (!self()->TestDPointer::isSelectedPluginsImmutable())
self()->d->selectedPlugins = v;
}
@@ -285,6 +320,11 @@ QStringList TestDPointer::selectedPlugins()
return self()->d->selectedPlugins;
}
+bool TestDPointer::isSelectedPluginsImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "SelectedPlugins" ) );
+}
+
KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
{
@@ -293,7 +333,7 @@ KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
void TestDPointer::setHighlightColor( const QColor & v )
{
- if (!self()->isImmutable( QStringLiteral( "HighlightColor" ) ))
+ if (!self()->TestDPointer::isHighlightColorImmutable())
self()->d->highlightColor = v;
}
@@ -302,6 +342,11 @@ QColor TestDPointer::highlightColor()
return self()->d->highlightColor;
}
+bool TestDPointer::isHighlightColorImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "HighlightColor" ) );
+}
+
KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
{
@@ -310,7 +355,7 @@ KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
void TestDPointer::setAgendaBgColor( const QColor & v )
{
- if (!self()->isImmutable( QStringLiteral( "AgendaBgColor" ) ))
+ if (!self()->TestDPointer::isAgendaBgColorImmutable())
self()->d->agendaBgColor = v;
}
@@ -319,6 +364,11 @@ QColor TestDPointer::agendaBgColor()
return self()->d->agendaBgColor;
}
+bool TestDPointer::isAgendaBgColorImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "AgendaBgColor" ) );
+}
+
KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
{
@@ -327,7 +377,7 @@ KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
void TestDPointer::setTimeBarFont( const QFont & v )
{
- if (!self()->isImmutable( QStringLiteral( "TimeBarFont" ) ))
+ if (!self()->TestDPointer::isTimeBarFontImmutable())
self()->d->timeBarFont = v;
}
@@ -336,6 +386,11 @@ QFont TestDPointer::timeBarFont()
return self()->d->timeBarFont;
}
+bool TestDPointer::isTimeBarFontImmutable()
+{
+ return self()->isImmutable( QStringLiteral( "TimeBarFont" ) );
+}
+
KConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem()
{
diff --git a/autotests/kconfig_compiler/test_dpointer.h.ref b/autotests/kconfig_compiler/test_dpointer.h.ref
index 04938566..a0886a07 100644
--- a/autotests/kconfig_compiler/test_dpointer.h.ref
+++ b/autotests/kconfig_compiler/test_dpointer.h.ref
@@ -34,6 +34,12 @@ class TestDPointer : public KConfigSkeleton
bool autoSave();
/**
+ Is Enable automatic saving of calendar Immutable
+ */
+ static
+ bool isAutoSaveImmutable();
+
+ /**
Get Item object corresponding to AutoSave()
*/
ItemBool *autoSaveItem();
@@ -51,6 +57,12 @@ class TestDPointer : public KConfigSkeleton
int autoSaveInterval();
/**
+ Is Auto Save Interval Immutable
+ */
+ static
+ bool isAutoSaveIntervalImmutable();
+
+ /**
Get Item object corresponding to AutoSaveInterval()
*/
ItemInt *autoSaveIntervalItem();
@@ -68,6 +80,12 @@ class TestDPointer : public KConfigSkeleton
bool confirm();
/**
+ Is Confirm deletes Immutable
+ */
+ static
+ bool isConfirmImmutable();
+
+ /**
Get Item object corresponding to Confirm()
*/
ItemBool *confirmItem();
@@ -85,6 +103,12 @@ class TestDPointer : public KConfigSkeleton
QString archiveFile();
/**
+ Is Archive File Immutable
+ */
+ static
+ bool isArchiveFileImmutable();
+
+ /**
Get Item object corresponding to ArchiveFile()
*/
ItemString *archiveFileItem();
@@ -102,6 +126,12 @@ class TestDPointer : public KConfigSkeleton
int destination();
/**
+ Is New Events/Todos Should Immutable
+ */
+ static
+ bool isDestinationImmutable();
+
+ /**
Get Item object corresponding to Destination()
*/
ItemEnum *destinationItem();
@@ -119,6 +149,12 @@ class TestDPointer : public KConfigSkeleton
int hourSize();
/**
+ Is Hour Size Immutable
+ */
+ static
+ bool isHourSizeImmutable();
+
+ /**
Get Item object corresponding to HourSize()
*/
ItemInt *hourSizeItem();
@@ -136,6 +172,12 @@ class TestDPointer : public KConfigSkeleton
bool selectionStartsEditor();
/**
+ Is Time range selection in agenda view starts event editor Immutable
+ */
+ static
+ bool isSelectionStartsEditorImmutable();
+
+ /**
Get Item object corresponding to SelectionStartsEditor()
*/
ItemBool *selectionStartsEditorItem();
@@ -153,6 +195,12 @@ class TestDPointer : public KConfigSkeleton
QStringList selectedPlugins();
/**
+ Is SelectedPlugins Immutable
+ */
+ static
+ bool isSelectedPluginsImmutable();
+
+ /**
Get Item object corresponding to SelectedPlugins()
*/
ItemStringList *selectedPluginsItem();
@@ -170,6 +218,12 @@ class TestDPointer : public KConfigSkeleton
QColor highlightColor();
/**
+ Is Highlight color Immutable
+ */
+ static
+ bool isHighlightColorImmutable();
+
+ /**
Get Item object corresponding to HighlightColor()
*/
ItemColor *highlightColorItem();
@@ -187,6 +241,12 @@ class TestDPointer : public KConfigSkeleton
QColor agendaBgColor();
/**
+ Is Agenda view background color Immutable
+ */
+ static
+ bool isAgendaBgColorImmutable();
+
+ /**
Get Item object corresponding to AgendaBgColor()
*/
ItemColor *agendaBgColorItem();
@@ -204,6 +264,12 @@ class TestDPointer : public KConfigSkeleton
QFont timeBarFont();
/**
+ Is Time bar Immutable
+ */
+ static
+ bool isTimeBarFontImmutable();
+
+ /**
Get Item object corresponding to TimeBarFont()
*/
ItemFont *timeBarFontItem();
diff --git a/autotests/kconfig_compiler/test_notifiers.h.ref b/autotests/kconfig_compiler/test_notifiers.h.ref
index 588427e2..6d73b7d0 100644
--- a/autotests/kconfig_compiler/test_notifiers.h.ref
+++ b/autotests/kconfig_compiler/test_notifiers.h.ref
@@ -19,7 +19,7 @@ class TestNotifiers : public KConfigSkeleton
*/
void setColor( const QColor & v )
{
- if (!isImmutable( QStringLiteral( "Color" ) ))
+ if (!isColorImmutable())
mColor = v;
}
@@ -32,11 +32,19 @@ class TestNotifiers : public KConfigSkeleton
}
/**
+ Is Block colors. Immutable
+ */
+ bool isColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Color" ) );
+ }
+
+ /**
Set foo bar
*/
void setFooBar( const QString & v )
{
- if (!isImmutable( QStringLiteral( "FooBar" ) ))
+ if (!isFooBarImmutable())
mFooBar = v;
}
@@ -49,6 +57,14 @@ class TestNotifiers : public KConfigSkeleton
}
/**
+ Is foo bar Immutable
+ */
+ bool isFooBarImmutable() const
+ {
+ return isImmutable( QStringLiteral( "FooBar" ) );
+ }
+
+ /**
Set Age
*/
void setAge( int v )
@@ -65,7 +81,7 @@ class TestNotifiers : public KConfigSkeleton
v = 88;
}
- if (!isImmutable( QStringLiteral( "Age" ) ))
+ if (!isAgeImmutable())
mAge = v;
}
@@ -77,6 +93,14 @@ class TestNotifiers : public KConfigSkeleton
return mAge;
}
+ /**
+ Is Age Immutable
+ */
+ bool isAgeImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Age" ) );
+ }
+
protected:
int mParamNumber;
diff --git a/autotests/kconfig_compiler/test_qdebugcategory.h.ref b/autotests/kconfig_compiler/test_qdebugcategory.h.ref
index 14e1ebac..cf7e3dbf 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( QStringLiteral( "Color" ) ))
+ if (!isColorImmutable())
mColor = v;
}
@@ -34,11 +34,19 @@ class TestQCategory : public KConfigSkeleton
}
/**
+ Is Block colors. Immutable
+ */
+ bool isColorImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Color" ) );
+ }
+
+ /**
Set foo bar
*/
void setFooBar( const QString & v )
{
- if (!isImmutable( QStringLiteral( "FooBar" ) ))
+ if (!isFooBarImmutable())
mFooBar = v;
}
@@ -51,6 +59,14 @@ class TestQCategory : public KConfigSkeleton
}
/**
+ Is foo bar Immutable
+ */
+ bool isFooBarImmutable() const
+ {
+ return isImmutable( QStringLiteral( "FooBar" ) );
+ }
+
+ /**
Set Age
*/
void setAge( int v )
@@ -67,7 +83,7 @@ class TestQCategory : public KConfigSkeleton
v = 88;
}
- if (!isImmutable( QStringLiteral( "Age" ) ))
+ if (!isAgeImmutable())
mAge = v;
}
@@ -79,6 +95,14 @@ class TestQCategory : public KConfigSkeleton
return mAge;
}
+ /**
+ Is Age Immutable
+ */
+ bool isAgeImmutable() const
+ {
+ return isImmutable( QStringLiteral( "Age" ) );
+ }
+
protected:
int mParamNumber;
diff --git a/autotests/kconfig_compiler/test_signal.h.ref b/autotests/kconfig_compiler/test_signal.h.ref
index a005e140..ef106a8d 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( QStringLiteral( "emoticonTheme" ) )) {
+ if (v != self()->mEmoticonTheme && !self()->isEmoticonThemeImmutable()) {
self()->mEmoticonTheme = v;
self()->mSettingsChanged |= signalEmoticonSettingsChanged;
}
@@ -37,12 +37,21 @@ class TestSignal : public KConfigSkeleton
}
/**
+ Is Current emoticon theme. Immutable
+ */
+ static
+ bool isEmoticonThemeImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "emoticonTheme" ) );
+ }
+
+ /**
Set Enable emoticon support in Kopete.
*/
static
void setUseEmoticon( bool v )
{
- if (v != self()->mUseEmoticon && !self()->isImmutable( QStringLiteral( "useEmoticon" ) )) {
+ if (v != self()->mUseEmoticon && !self()->isUseEmoticonImmutable()) {
self()->mUseEmoticon = v;
self()->mSettingsChanged |= signalEmoticonSettingsChanged;
}
@@ -58,12 +67,21 @@ class TestSignal : public KConfigSkeleton
}
/**
+ Is Enable emoticon support in Kopete. Immutable
+ */
+ static
+ bool isUseEmoticonImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "useEmoticon" ) );
+ }
+
+ /**
Set Use strict mode in emoticon parsing.
*/
static
void setEmoticonRequireSpace( bool v )
{
- if (v != self()->mEmoticonRequireSpace && !self()->isImmutable( QStringLiteral( "emoticonRequireSpace" ) )) {
+ if (v != self()->mEmoticonRequireSpace && !self()->isEmoticonRequireSpaceImmutable()) {
self()->mEmoticonRequireSpace = v;
self()->mSettingsChanged |= signalEmoticonSettingsChanged;
}
@@ -79,12 +97,21 @@ class TestSignal : public KConfigSkeleton
}
/**
+ Is Use strict mode in emoticon parsing. Immutable
+ */
+ static
+ bool isEmoticonRequireSpaceImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "emoticonRequireSpace" ) );
+ }
+
+ /**
Set Absolute path to a directory containing a Adium/Kopete chat window style.
*/
static
void setStylePath( const QString & v )
{
- if (v != self()->mStylePath && !self()->isImmutable( QStringLiteral( "stylePath" ) )) {
+ if (v != self()->mStylePath && !self()->isStylePathImmutable()) {
self()->mStylePath = v;
self()->mSettingsChanged |= signalStyleChanged;
}
@@ -100,12 +127,21 @@ class TestSignal : public KConfigSkeleton
}
/**
+ Is Absolute path to a directory containing a Adium/Kopete chat window style. Immutable
+ */
+ static
+ bool isStylePathImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "stylePath" ) );
+ }
+
+ /**
Set Relative path to a CSS variant for the current style.
*/
static
void setStyleCSSVariant( const QString & v )
{
- if (!self()->isImmutable( QStringLiteral( "StyleCSSVariant" ) ))
+ if (!self()->isStyleCSSVariantImmutable())
self()->mStyleCSSVariant = v;
}
@@ -118,6 +154,15 @@ class TestSignal : public KConfigSkeleton
return self()->mStyleCSSVariant;
}
+ /**
+ Is Relative path to a CSS variant for the current style. Immutable
+ */
+ static
+ bool isStyleCSSVariantImmutable()
+ {
+ return self()->isImmutable( QStringLiteral( "StyleCSSVariant" ) );
+ }
+
enum {
signalEmoticonSettingsChanged = 0x1,
diff --git a/autotests/kconfig_compiler/test_translation_kde.h.ref b/autotests/kconfig_compiler/test_translation_kde.h.ref
index 0e50b5a2..781cdcea 100644
--- a/autotests/kconfig_compiler/test_translation_kde.h.ref
+++ b/autotests/kconfig_compiler/test_translation_kde.h.ref
@@ -25,6 +25,14 @@ class TestTranslationKde : public KConfigSkeleton
return mAutoSave;
}
+ /**
+ Is Enable automatic saving of calendar Immutable
+ */
+ bool isAutoSaveImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSave" ) );
+ }
+
protected:
// General
diff --git a/autotests/kconfig_compiler/test_translation_kde_domain.h.ref b/autotests/kconfig_compiler/test_translation_kde_domain.h.ref
index 4ed5d9bd..38634817 100644
--- a/autotests/kconfig_compiler/test_translation_kde_domain.h.ref
+++ b/autotests/kconfig_compiler/test_translation_kde_domain.h.ref
@@ -25,6 +25,14 @@ class TestTranslationKdeDomain : public KConfigSkeleton
return mAutoSave;
}
+ /**
+ Is Enable automatic saving of calendar Immutable
+ */
+ bool isAutoSaveImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSave" ) );
+ }
+
protected:
// General
diff --git a/autotests/kconfig_compiler/test_translation_qt.h.ref b/autotests/kconfig_compiler/test_translation_qt.h.ref
index 2fe3274a..11590509 100644
--- a/autotests/kconfig_compiler/test_translation_qt.h.ref
+++ b/autotests/kconfig_compiler/test_translation_qt.h.ref
@@ -25,6 +25,14 @@ class TestTranslationQt : public KConfigSkeleton
return mAutoSave;
}
+ /**
+ Is Enable automatic saving of calendar Immutable
+ */
+ bool isAutoSaveImmutable() const
+ {
+ return isImmutable( QStringLiteral( "AutoSave" ) );
+ }
+
protected:
// General
diff --git a/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp b/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp
index 5a110b2e..239c906c 100644
--- a/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp
+++ b/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp
@@ -184,39 +184,51 @@ QString KConfigCodeGeneratorBase::memberAccessorBody(const CfgEntry *e, bool glo
return result;
}
-void KConfigCodeGeneratorBase::createIfSetLogic(const CfgEntry *e, const QString &varExpression)
+void KConfigCodeGeneratorBase::memberImmutableBody(const CfgEntry *e, bool globalEnums)
{
- const QString n = e->name;
- const QString t = e->type;
- const bool hasBody = !e->signalList.empty() || m_cfg.generateProperties;
+ QString n = e->name;
+ QString t = e->type;
- m_stream << whitespace() << "if (";
- if (hasBody) {
- m_stream << "v != " << varExpression << " && ";
- }
- m_stream << "!" << m_this << "isImmutable( QStringLiteral( \"";
+ stream() << whitespace() << "return " << m_this << "isImmutable( QStringLiteral( \"";
if (!e->param.isEmpty()) {
- QString paramName = e->paramName;
-
- m_stream << paramName.replace(QStringLiteral("$(") + e->param + QStringLiteral(")"), QLatin1String("%1")) << "\" ).arg( ";
+ stream() << QString(e->paramName).replace(QLatin1String("$(") + e->param + QLatin1Char(')'), QLatin1String("%1")) << "\" ).arg( ";
if (e->paramType == QLatin1String("Enum")) {
- m_stream << "QLatin1String( ";
+ stream() << "QLatin1String( ";
- if (m_cfg.globalEnums) {
- m_stream << enumName(e->param) << "ToString[i]";
+ if (globalEnums) {
+ stream() << enumName(e->param) << "ToString[i]";
} else {
- m_stream << enumName(e->param) << "::enumToString[i]";
+ stream() << enumName(e->param) << "::enumToString[i]";
}
- m_stream << " )";
+ stream() << " )";
} else {
- m_stream << "i";
+ stream() << "i";
}
- m_stream << " )";
+ stream() << " )";
} else {
- m_stream << n << "\" )";
+ stream() << n << "\" )";
+ }
+ stream() << " );" << endl;
+}
+
+void KConfigCodeGeneratorBase::createIfSetLogic(const CfgEntry *e, const QString &varExpression)
+{
+ const QString n = e->name;
+ const QString t = e->type;
+ const bool hasBody = !e->signalList.empty() || m_cfg.generateProperties;
+
+ m_stream << whitespace() << "if (";
+ if (hasBody) {
+ m_stream << "v != " << varExpression << " && ";
+ }
+
+ const auto immutablefunction = immutableFunction(n, m_cfg.dpointer ? m_cfg.className : QString());
+ m_stream << "!" << m_this << immutablefunction << "(";
+ if (!e->param.isEmpty()) {
+ m_stream << " i ";
}
- m_stream << " ))";
+ m_stream << "))";
}
void KConfigCodeGeneratorBase::memberMutatorBody(const CfgEntry *e)
diff --git a/src/kconfig_compiler/KConfigCodeGeneratorBase.h b/src/kconfig_compiler/KConfigCodeGeneratorBase.h
index 5bbc6b71..0c815c9b 100644
--- a/src/kconfig_compiler/KConfigCodeGeneratorBase.h
+++ b/src/kconfig_compiler/KConfigCodeGeneratorBase.h
@@ -82,6 +82,9 @@ public:
// TODO: write to the stream directly without returning a QString.
QString memberAccessorBody(const CfgEntry *e, bool globalEnums) const;
+ // Implements the is<Param>Immutable for the CfgEntry
+ void memberImmutableBody(const CfgEntry *e, bool globalEnums);
+
// Implements the `Set` methods for the CfgEntry
void memberMutatorBody(const CfgEntry *e);
diff --git a/src/kconfig_compiler/KConfigCommonStructs.h b/src/kconfig_compiler/KConfigCommonStructs.h
index 69b855ce..71bf666e 100644
--- a/src/kconfig_compiler/KConfigCommonStructs.h
+++ b/src/kconfig_compiler/KConfigCommonStructs.h
@@ -136,6 +136,7 @@ QString enumType(const CfgEntry *e, bool globalEnums);
QString getDefaultFunction(const QString &n, const QString &className = QString());
QString setFunction(const QString &n, const QString &className = QString());
QString getFunction(const QString &n, const QString &className = QString());
+QString immutableFunction(const QString &n, const QString &className = QString());
QString itemAccessorBody(const CfgEntry *e, const KConfigParameters &cfg);
QString signalEnumName(const QString &signalName);
diff --git a/src/kconfig_compiler/KConfigHeaderGenerator.cpp b/src/kconfig_compiler/KConfigHeaderGenerator.cpp
index 5b828ec8..f6c39b6a 100644
--- a/src/kconfig_compiler/KConfigHeaderGenerator.cpp
+++ b/src/kconfig_compiler/KConfigHeaderGenerator.cpp
@@ -79,7 +79,9 @@ void KConfigHeaderGenerator::doClassDefinition()
createSetters(entry);
createProperties(entry, returnType);
+ createImmutableProperty(entry);
createGetters(entry, returnType);
+ createImmutableGetters(entry);
createDefaultValueMember(entry);
createItemAcessors(entry, returnType);
}
@@ -172,7 +174,7 @@ void KConfigHeaderGenerator::implementChoiceEnums(const CfgEntry *entry, const C
}
QStringList values;
- for (const auto choice : qAsConst(chlist)) {
+ for (const auto &choice : qAsConst(chlist)) {
values.append(choices.prefix + choice.name);
}
@@ -415,6 +417,16 @@ void KConfigHeaderGenerator::createProperties(const CfgEntry *entry, const QStri
stream() << ")\n";
}
+void KConfigHeaderGenerator::createImmutableProperty(const CfgEntry *entry)
+{
+ if (!cfg().generateProperties) {
+ return;
+ }
+ stream() << whitespace();
+ stream() << "Q_PROPERTY(bool " << immutableFunction(entry->name);
+ stream() << " CONSTANT)\n";
+}
+
void KConfigHeaderGenerator::createSetters(const CfgEntry *entry)
{
// Manipulator
@@ -484,8 +496,38 @@ void KConfigHeaderGenerator::createGetters(const CfgEntry *entry, const QString
}
}
+void KConfigHeaderGenerator::createImmutableGetters(const CfgEntry *entry)
+{
+ stream() << whitespace() << "/**\n";
+ stream() << whitespace() << " Is " << entry->label << " Immutable\n";
+ stream() << whitespace() << "*/\n";
+ // Immutable
+ if (cfg().staticAccessors) {
+ stream() << whitespace() << "static\n";
+ }
+ stream() << whitespace() << "";
+ stream() << "bool " << immutableFunction(entry->name) << "(";
+ if (!entry->param.isEmpty()) {
+ stream() << " " << cppType(entry->paramType)<< " i ";
+ }
+ stream() << ")" << Const();
+ // function body inline only if not using dpointer
+ // for BC mode
+ if (!cfg().dpointer) {
+ stream() << '\n';
+ startScope();
+ memberImmutableBody(entry, cfg().globalEnums);
+ endScope();
+ stream() << '\n';
+ } else {
+ stream() << ";\n\n";
+ }
+}
+
void KConfigHeaderGenerator::createItemAcessors(const CfgEntry *entry, const QString &returnType)
{
+ Q_UNUSED(returnType)
+
// Item accessor
if (!cfg().itemAccessors) {
return;
diff --git a/src/kconfig_compiler/KConfigHeaderGenerator.h b/src/kconfig_compiler/KConfigHeaderGenerator.h
index 0b85594a..d780b850 100644
--- a/src/kconfig_compiler/KConfigHeaderGenerator.h
+++ b/src/kconfig_compiler/KConfigHeaderGenerator.h
@@ -71,7 +71,9 @@ private:
void createSetters(const CfgEntry *entry);
void createItemAcessors(const CfgEntry *entry, const QString &returnType);
void createGetters(const CfgEntry *entry, const QString &returnType);
+ void createImmutableGetters(const CfgEntry *entry);
void createProperties(const CfgEntry *entry, const QString &returnType);
+ void createImmutableProperty(const CfgEntry *entry);
void createDefaultValueMember(const CfgEntry *entry);
};
diff --git a/src/kconfig_compiler/KConfigSourceGenerator.cpp b/src/kconfig_compiler/KConfigSourceGenerator.cpp
index 87d00960..63f5b6b4 100644
--- a/src/kconfig_compiler/KConfigSourceGenerator.cpp
+++ b/src/kconfig_compiler/KConfigSourceGenerator.cpp
@@ -478,6 +478,20 @@ void KConfigSourceGenerator::createGetterDPointerMode(const CfgEntry *entry)
stream() << '\n';
}
+void KConfigSourceGenerator::createImmutableGetterDPointerMode(const CfgEntry *entry)
+{
+ stream() << whitespace() << "";
+ stream() << "bool " << " " << immutableFunction(entry->name, cfg().className) << "(";
+ if (!entry->param.isEmpty()) {
+ stream() << " " << cppType(entry->paramType) << " i ";
+ }
+ stream() << ")" << Const() << '\n';
+ startScope();
+ memberImmutableBody(entry, cfg().globalEnums);
+ endScope();
+ stream() << '\n';
+}
+
void KConfigSourceGenerator::createSetterDPointerMode(const CfgEntry *entry)
{
// Manipulator
@@ -533,6 +547,7 @@ void KConfigSourceGenerator::doGetterSetterDPointerMode()
for (auto *entry : parseResult.entries) {
createSetterDPointerMode(entry);
createGetterDPointerMode(entry);
+ createImmutableGetterDPointerMode(entry);
createItemGetterDPointerMode(entry);
stream() << '\n';
}
diff --git a/src/kconfig_compiler/KConfigSourceGenerator.h b/src/kconfig_compiler/KConfigSourceGenerator.h
index 510d4048..1e1ffc97 100644
--- a/src/kconfig_compiler/KConfigSourceGenerator.h
+++ b/src/kconfig_compiler/KConfigSourceGenerator.h
@@ -76,6 +76,7 @@ private:
void doGetterSetterDPointerMode();
void createGetterDPointerMode(const CfgEntry *entry);
+ void createImmutableGetterDPointerMode(const CfgEntry *entry);
void createSetterDPointerMode(const CfgEntry *entry);
void createItemGetterDPointerMode(const CfgEntry *entry);
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index 11becf5c..989e2609 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -154,6 +154,18 @@ QString getFunction(const QString &n, const QString &className)
return result;
}
+QString immutableFunction(const QString &n, const QString &className)
+{
+ QString result = QLatin1String("is") + n;
+ result[2] = result[2].toUpper();
+ result += "Immutable";
+
+ if (!className.isEmpty()) {
+ result = className + QLatin1String("::") + result;
+ }
+ return result;
+}
+
void addQuotes(QString &s)
{
if (!s.startsWith(QLatin1Char('"'))) {