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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/localization
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-04 7:41:45
Message-ID: 20101104074145.AFFF9AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192840 by ervin:

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

 M  +2 -0      kcharsets.cpp  
 M  +2 -0      kcharsets.h  
 M  +2 -0      kencodingprober.cpp  
 M  +2 -0      kencodingprober.h  


--- trunk/KDE/kdelibs/kdecore/localization/kcharsets.cpp #1192839:1192840
@@ -640,6 +640,7 @@
     return available;
 }
 
+#ifndef KDE_NO_DEPRECATED
 QString KCharsets::languageForEncoding( const QString &encoding ) const
 {
     const char* lang = kcharsets_array_search( (const char*)language_for_encoding_string,
@@ -650,6 +651,7 @@
     else
         return i18nc( "@item Text character set", "Other" );
 }
+#endif
 
 QString KCharsets::descriptionForEncoding( const QString& encoding ) const
 {
--- trunk/KDE/kdelibs/kdecore/localization/kcharsets.h #1192839:1192840
@@ -144,7 +144,9 @@
      * @deprecated Please use descriptionForEncoding instead.
      * This function will be removed before KDE4 is released.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED QString languageForEncoding( const QString &encoding ) const;
+#endif
 
     /**
      * @brief Returns a long description for an encoding name.
--- trunk/KDE/kdelibs/kdecore/localization/kencodingprober.cpp #1192839:1192840
@@ -195,10 +195,12 @@
 }
 
 //DEPRECATED, do *not* use
+#ifndef KDE_NO_DEPRECATED
 const char* KEncodingProber::encodingName() const
 {
     return qstrdup(encoding().constData());
 }
+#endif
 
 QByteArray KEncodingProber::encoding() const
 {
--- trunk/KDE/kdelibs/kdecore/localization/kencodingprober.h #1192839:1192840
@@ -129,7 +129,9 @@
      * @warning The returned string is allocated with strdup, so some memory is leaked with every call.
      * @deprecated Use encoding() instead, which returns a QByteArray.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED const char* encodingName() const;
+#endif
 
     /**
      * @returns a QByteArray with the name of the best encoding it has guessed so far
[prev in list] [next in list] [prev in thread] [next in thread]