[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/config
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-04 7:42:10
Message-ID: 20101104074210.B57B2AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192841 by ervin:

Remove deprecated symbol from the build (if KDE_NO_DEPRECATED is defined).

 M  +4 -0      kconfig.cpp  
 M  +4 -0      kconfig.h  
 M  +4 -0      kconfiggroup.cpp  
 M  +4 -0      kconfiggroup.h  
 M  +4 -0      kcoreconfigskeleton.cpp  
 M  +8 -0      kcoreconfigskeleton.h  


--- trunk/KDE/kdelibs/kdecore/config/kconfig.cpp #1192840:1192841
@@ -612,17 +612,21 @@
     return isImmutable() || d->entryMap.getEntryOption(aGroup, 0, 0, \
KEntryMap::EntryImmutable);  }
 
+#ifndef KDE_NO_DEPRECATED
 void KConfig::setForceGlobal(bool b)
 {
     Q_D(KConfig);
     d->bForceGlobal = b;
 }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 bool KConfig::forceGlobal() const
 {
     Q_D(const KConfig);
     return d->bForceGlobal;
 }
+#endif
 
 KConfigGroup KConfig::groupImpl(const QByteArray &group)
 {
--- trunk/KDE/kdelibs/kdecore/config/kconfig.h #1192840:1192841
@@ -346,7 +346,9 @@
      * @param force true to force writing to kdeglobals
      * @see forceGlobal
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED void setForceGlobal(bool force);
+#endif
     /**
      * @deprecated
      *
@@ -356,7 +358,9 @@
      * @see setForceGlobal
      * @deprecated
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED bool forceGlobal() const;
+#endif
     /// @}
 
     /// @reimp
--- trunk/KDE/kdelibs/kdecore/config/kconfiggroup.cpp #1192840:1192841
@@ -651,19 +651,23 @@
     config()->deleteGroup(d->fullName(), flags);
 }
 
+#ifndef KDE_NO_DEPRECATED
 void KConfigGroup::changeGroup( const QString &group )
 {
     Q_ASSERT_X(isValid(), "KConfigGroup::changeGroup", "accessing an invalid \
group");  d.detach();
     d->mName = group.toUtf8();
 }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 void KConfigGroup::changeGroup( const char *group )
 {
     Q_ASSERT_X(isValid(), "KConfigGroup::changeGroup", "accessing an invalid \
group");  d.detach();
     d->mName = group;
 }
+#endif
 
 QString KConfigGroup::name() const
 {
--- trunk/KDE/kdelibs/kdecore/config/kconfiggroup.h #1192840:1192841
@@ -149,14 +149,18 @@
      * @deprecated
      * Create another KConfigGroup from the parent of this group instead.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED void changeGroup(const QString &group);
+#endif
     /**
      * Overload for changeGroup(const QString&)
      *
      * @deprecated
      * Create another KConfigGroup from the parent of this group instead.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED void changeGroup(const char *group);
+#endif
 
     /**
      * Copies the entries in this group to another configuration object
--- trunk/KDE/kdelibs/kdecore/config/kcoreconfigskeleton.cpp #1192840:1192841
@@ -1195,6 +1195,7 @@
   return item;
 }
 
+#ifndef KDE_NO_DEPRECATED
 KCoreConfigSkeleton::ItemLongLong *KCoreConfigSkeleton::addItemInt64(
         const QString& name,
         qint64 &reference,
@@ -1203,6 +1204,7 @@
 {
     return addItemLongLong(name, reference, defaultValue, key);
 }
+#endif
 
 KCoreConfigSkeleton::ItemULongLong *KCoreConfigSkeleton::addItemULongLong( const \
                QString &name, quint64 &reference,
                                      quint64 defaultValue, const QString &key )
@@ -1214,6 +1216,7 @@
   return item;
 }
 
+#ifndef KDE_NO_DEPRECATED
 KCoreConfigSkeleton::ItemULongLong *KCoreConfigSkeleton::addItemUInt64(
         const QString & name,
         quint64 &reference,
@@ -1222,6 +1225,7 @@
 {
     return addItemULongLong(name, reference, defaultValue, key);
 }
+#endif
 
 KCoreConfigSkeleton::ItemDouble *KCoreConfigSkeleton::addItemDouble( const QString \
                &name, double &reference,
                                      double defaultValue, const QString &key )
--- trunk/KDE/kdelibs/kdecore/config/kcoreconfigskeleton.h #1192840:1192841
@@ -599,7 +599,9 @@
     qint64 mMin;
     qint64 mMax;
   };
+#ifndef KDE_NO_DEPRECATED
   typedef KDE_DEPRECATED ItemLongLong ItemInt64;
+#endif
 
   /**
    * Class for handling enums.
@@ -730,7 +732,9 @@
     quint64 mMin;
     quint64 mMax;
   };
+#ifndef KDE_NO_DEPRECATED
   typedef KDE_DEPRECATED ItemULongLong ItemUInt64;
+#endif
 
   /**
    * Class for handling a floating point preference item.
@@ -1171,9 +1175,11 @@
    * @deprecated
    * Use addItemLongLong().
    */
+#ifndef KDE_NO_DEPRECATED
   KDE_DEPRECATED ItemLongLong *addItemInt64( const QString& name, qint64 &reference,
                           qint64 defaultValue = 0,
                           const QString & key = QString());
+#endif
 
   /**
    * Register an item of type quint64
@@ -1194,9 +1200,11 @@
    * @deprecated
    * Use addItemULongLong().
    */
+#ifndef KDE_NO_DEPRECATED
   KDE_DEPRECATED ItemULongLong *addItemUInt64(const QString & name, quint64 \
&reference,  quint64 defaultValue = 0,
                             const QString & key = QString());
+#endif
 
   /**
    * Register an item of type double.


[prev in list] [next in list] [prev in thread] [next in thread]