Make it static

akonadi/calendar/blockalarmsattribute.cpp

@@ -92,7 +92,8 @@ bool BlockAlarmsAttribute::isAlarmTypeBlocked(KCalCore::Alarm::Type type) const
 
 QByteArray BlockAlarmsAttribute::type() const
 {
-    return "BlockAlarmsAttribute";
+    static const QByteArray sType( "BlockAlarmsAttribute" );
+    return sType;
 }
 
 BlockAlarmsAttribute *BlockAlarmsAttribute::clone() const

akonadi/collectionquotaattribute.cpp

@@ -73,7 +73,8 @@ qint64 CollectionQuotaAttribute::maximumValue() const
 
 QByteArray CollectionQuotaAttribute::type() const
 {
-    return "collectionquota";
+    static const QByteArray sType( "collectionquota" );
+    return sType;
 }
 
 Akonadi::Attribute *CollectionQuotaAttribute::clone() const

akonadi/contact/contactmetadataattribute.cpp

@@ -53,7 +53,8 @@ QVariantMap ContactMetaDataAttribute::metaData() const
 
 QByteArray ContactMetaDataAttribute::type() const
 {
-  return "contactmetadata";
+    static const QByteArray sType( "contactmetadata" );
+    return sType;
 }
 
 Attribute* ContactMetaDataAttribute::clone() const

akonadi/entityannotationsattribute.cpp

@@ -61,7 +61,8 @@ bool EntityAnnotationsAttribute::contains(const QByteArray &key) const
 
 QByteArray EntityAnnotationsAttribute::type() const
 {
-    return "entityannotations";
+    static const QByteArray sType( "entityannotations" );
+    return sType;
 }
 
 Akonadi::Attribute *EntityAnnotationsAttribute::clone() const

akonadi/entitydeletedattribute.cpp

@@ -74,7 +74,8 @@ QString EntityDeletedAttribute::restoreResource() const
 
 QByteArray Akonadi::EntityDeletedAttribute::type() const
 {
-    return "DELETED";
+    static const QByteArray sType( "DELETED" );
+    return sType;
 }
 
 EntityDeletedAttribute *EntityDeletedAttribute::clone() const

akonadi/entitydisplayattribute.cpp

@@ -76,7 +76,8 @@ void EntityDisplayAttribute::setIconName(const QString &icon)
 
 QByteArray Akonadi::EntityDisplayAttribute::type() const
 {
-    return "ENTITYDISPLAY";
+    static const QByteArray sType( "ENTITYDISPLAY" );
+    return sType;
 }
 
 EntityDisplayAttribute *EntityDisplayAttribute::clone() const

akonadi/entityhiddenattribute.cpp

@@ -36,7 +36,8 @@ EntityHiddenAttribute::~EntityHiddenAttribute()
 
 QByteArray Akonadi::EntityHiddenAttribute::type() const
 {
-    return "HIDDEN";
+    static const QByteArray sType( "HIDDEN" );
+    return sType;
 }
 
 EntityHiddenAttribute *EntityHiddenAttribute::clone() const

akonadi/indexpolicyattribute.cpp

@@ -57,7 +57,8 @@ void IndexPolicyAttribute::setIndexingEnabled(bool enable)
 
 QByteArray IndexPolicyAttribute::type() const
 {
-    return "INDEXPOLICY";
+    static const QByteArray sType( "INDEXPOLICY" );
+    return sType;
 }
 
 Attribute *IndexPolicyAttribute::clone() const

akonadi/kmime/messagefolderattribute.cpp

@@ -48,7 +48,8 @@ MessageFolderAttribute::~MessageFolderAttribute()
 
 QByteArray MessageFolderAttribute::type() const
 {
-    return "MESSAGEFOLDER";
+    static const QByteArray sType( "MESSAGEFOLDER" );
+    return sType;
 }
 
 MessageFolderAttribute *MessageFolderAttribute::clone() const

akonadi/kmime/messagethreadingattribute.cpp

@@ -47,7 +47,8 @@ MessageThreadingAttribute::~ MessageThreadingAttribute()
 
 QByteArray MessageThreadingAttribute::type() const
 {
-    return "MESSAGETHREADING";
+    static const QByteArray sType( "MESSAGETHREADING" );
+    return sType;
 }
 
 MessageThreadingAttribute *MessageThreadingAttribute::clone() const

akonadi/persistentsearchattribute.cpp

@@ -112,7 +112,8 @@ void PersistentSearchAttribute::setRemoteSearchEnabled(bool enabled)
 
 QByteArray PersistentSearchAttribute::type() const
 {
-    return "PERSISTENTSEARCH"; // ### should eventually be AKONADI_PARAM_PERSISTENTSEARCH
+    static const QByteArray sType( "PERSISTENTSEARCH" );
+    return sType;
 }
 
 Attribute *PersistentSearchAttribute::clone() const

akonadi/socialutils/socialnetworkattributes.cpp

@@ -81,7 +81,8 @@ Akonadi::Attribute *Akonadi::SocialNetworkAttributes::clone() const
 
 QByteArray Akonadi::SocialNetworkAttributes::type() const
 {
-  return QByteArray( "socialattributes" );
+    static const QByteArray sType( "socialattributes" );
+    return sType;
 }
 
 QString Akonadi::SocialNetworkAttributes::userName() const

akonadi/tagattribute.cpp

@@ -75,7 +75,8 @@ void TagAttribute::setIconName(const QString &icon)
 
 QByteArray Akonadi::TagAttribute::type() const
 {
-    return "TAG";
+    static const QByteArray sType( "TAG" );
+    return sType;
 }
 
 TagAttribute *TagAttribute::clone() const

kalarmcal/compatibilityattribute.cpp

@@ -97,7 +97,8 @@ QByteArray CompatibilityAttribute::type() const
 
 QByteArray CompatibilityAttribute::name()
 {
-    return "KAlarmCompatibility";
+    static const QByteArray sType( "KAlarmCompatibility" );
+    return sType;
 }
 
 QByteArray CompatibilityAttribute::serialized() const

kalarmcal/eventattribute.cpp

@@ -74,7 +74,8 @@ void EventAttribute::setCommandError(KAEvent::CmdErrType err)
 
 QByteArray EventAttribute::type() const
 {
-    return "KAlarmEvent";
+    static const QByteArray sType( "KAlarmEvent" );
+    return sType;
 }
 
 EventAttribute* EventAttribute::clone() const