Changeset View
Changeset View
Standalone View
Standalone View
src/core/kcoreconfigskeleton.cpp
Show First 20 Lines • Show All 1156 Lines • ▼ Show 20 Line(s) | |||||
1157 | { | 1157 | { | ||
1158 | return false; | 1158 | return false; | ||
1159 | } | 1159 | } | ||
1160 | 1160 | | |||
1161 | void KCoreConfigSkeleton::usrSetDefaults() | 1161 | void KCoreConfigSkeleton::usrSetDefaults() | ||
1162 | { | 1162 | { | ||
1163 | } | 1163 | } | ||
1164 | 1164 | | |||
1165 | #ifdef Q_CC_GNU | | |||
1166 | #pragma GCC diagnostic push | | |||
1167 | #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | | |||
1168 | #endif | | |||
1169 | void KCoreConfigSkeleton::usrRead() | 1165 | void KCoreConfigSkeleton::usrRead() | ||
1170 | { | 1166 | { | ||
1167 | #if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0) | ||||
1171 | usrReadConfig(); | 1168 | usrReadConfig(); | ||
1172 | } | | |||
1173 | #ifdef Q_CC_GNU | | |||
1174 | #pragma GCC diagnostic pop | | |||
1175 | #endif | 1169 | #endif | ||
1170 | } | ||||
1176 | 1171 | | |||
1172 | #if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0) | ||||
1177 | void KCoreConfigSkeleton::usrReadConfig() | 1173 | void KCoreConfigSkeleton::usrReadConfig() | ||
1178 | { | 1174 | { | ||
1179 | } | 1175 | } | ||
1180 | | ||||
1181 | #ifdef Q_CC_GNU | | |||
1182 | #pragma GCC diagnostic push | | |||
1183 | #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | | |||
1184 | #endif | 1176 | #endif | ||
1177 | | ||||
1185 | bool KCoreConfigSkeleton::usrSave() | 1178 | bool KCoreConfigSkeleton::usrSave() | ||
1186 | { | 1179 | { | ||
1180 | #if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0) | ||||
1187 | return usrWriteConfig(); | 1181 | return usrWriteConfig(); | ||
1188 | } | 1182 | #else | ||
1189 | #ifdef Q_CC_GNU | 1183 | return true; | ||
1190 | #pragma GCC diagnostic pop | | |||
1191 | #endif | 1184 | #endif | ||
1185 | } | ||||
1192 | 1186 | | |||
1187 | #if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0) | ||||
1193 | bool KCoreConfigSkeleton::usrWriteConfig() | 1188 | bool KCoreConfigSkeleton::usrWriteConfig() | ||
1194 | { | 1189 | { | ||
1195 | return true; | 1190 | return true; | ||
1196 | } | 1191 | } | ||
1192 | #endif | ||||
1197 | 1193 | | |||
1198 | void KCoreConfigSkeleton::addItem(KConfigSkeletonItem *item, const QString &name) | 1194 | void KCoreConfigSkeleton::addItem(KConfigSkeletonItem *item, const QString &name) | ||
1199 | { | 1195 | { | ||
1200 | if (d->mItems.contains(item)) { | 1196 | if (d->mItems.contains(item)) { | ||
1201 | if (item->name() == name || | 1197 | if (item->name() == name || | ||
1202 | (name.isEmpty() && item->name() == item->key())) { | 1198 | (name.isEmpty() && item->name() == item->key())) { | ||
1203 | // nothing to do -> it is already in our collection | 1199 | // nothing to do -> it is already in our collection | ||
1204 | // and the name isn't changing | 1200 | // and the name isn't changing | ||
▲ Show 20 Lines • Show All 105 Lines • ▼ Show 20 Line(s) | |||||
1310 | { | 1306 | { | ||
1311 | KCoreConfigSkeleton::ItemLongLong *item; | 1307 | KCoreConfigSkeleton::ItemLongLong *item; | ||
1312 | item = new KCoreConfigSkeleton::ItemLongLong(d->mCurrentGroup, key.isNull() ? name : key, | 1308 | item = new KCoreConfigSkeleton::ItemLongLong(d->mCurrentGroup, key.isNull() ? name : key, | ||
1313 | reference, defaultValue); | 1309 | reference, defaultValue); | ||
1314 | addItem(item, name); | 1310 | addItem(item, name); | ||
1315 | return item; | 1311 | return item; | ||
1316 | } | 1312 | } | ||
1317 | 1313 | | |||
1318 | #ifndef KDE_NO_DEPRECATED | 1314 | #if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0) | ||
1319 | KCoreConfigSkeleton::ItemLongLong *KCoreConfigSkeleton::addItemInt64( | 1315 | KCoreConfigSkeleton::ItemLongLong *KCoreConfigSkeleton::addItemInt64( | ||
1320 | const QString &name, | 1316 | const QString &name, | ||
1321 | qint64 &reference, | 1317 | qint64 &reference, | ||
1322 | qint64 defaultValue, | 1318 | qint64 defaultValue, | ||
1323 | const QString &key) | 1319 | const QString &key) | ||
1324 | { | 1320 | { | ||
1325 | return addItemLongLong(name, reference, defaultValue, key); | 1321 | return addItemLongLong(name, reference, defaultValue, key); | ||
1326 | } | 1322 | } | ||
1327 | #endif | 1323 | #endif | ||
1328 | 1324 | | |||
1329 | KCoreConfigSkeleton::ItemULongLong *KCoreConfigSkeleton::addItemULongLong(const QString &name, quint64 &reference, | 1325 | KCoreConfigSkeleton::ItemULongLong *KCoreConfigSkeleton::addItemULongLong(const QString &name, quint64 &reference, | ||
1330 | quint64 defaultValue, const QString &key) | 1326 | quint64 defaultValue, const QString &key) | ||
1331 | { | 1327 | { | ||
1332 | KCoreConfigSkeleton::ItemULongLong *item; | 1328 | KCoreConfigSkeleton::ItemULongLong *item; | ||
1333 | item = new KCoreConfigSkeleton::ItemULongLong(d->mCurrentGroup, key.isNull() ? name : key, | 1329 | item = new KCoreConfigSkeleton::ItemULongLong(d->mCurrentGroup, key.isNull() ? name : key, | ||
1334 | reference, defaultValue); | 1330 | reference, defaultValue); | ||
1335 | addItem(item, name); | 1331 | addItem(item, name); | ||
1336 | return item; | 1332 | return item; | ||
1337 | } | 1333 | } | ||
1338 | 1334 | | |||
1339 | #ifndef KDE_NO_DEPRECATED | 1335 | #if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0) | ||
1340 | KCoreConfigSkeleton::ItemULongLong *KCoreConfigSkeleton::addItemUInt64( | 1336 | KCoreConfigSkeleton::ItemULongLong *KCoreConfigSkeleton::addItemUInt64( | ||
1341 | const QString &name, | 1337 | const QString &name, | ||
1342 | quint64 &reference, | 1338 | quint64 &reference, | ||
1343 | quint64 defaultValue, | 1339 | quint64 defaultValue, | ||
1344 | const QString &key) | 1340 | const QString &key) | ||
1345 | { | 1341 | { | ||
1346 | return addItemULongLong(name, reference, defaultValue, key); | 1342 | return addItemULongLong(name, reference, defaultValue, key); | ||
1347 | } | 1343 | } | ||
▲ Show 20 Lines • Show All 160 Lines • Show Last 20 Lines |