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

List:       kde-commits
Subject:    KDE/kdelibs/kate/utils
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2010-03-07 11:37:40
Message-ID: 1267961860.068725.30510.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1100358 by cullmann:

remove more remains of encoding detection

 M  +1 -9      kateconfig.cpp  
 M  +1 -1      kateconfig.h  


--- trunk/KDE/kdelibs/kate/utils/kateconfig.cpp #1100357:1100358
@@ -430,16 +430,13 @@
   return s_global->codec ();
 }
 
-bool KateDocumentConfig::setEncoding (const QString &encoding, bool resetDetection)
+bool KateDocumentConfig::setEncoding (const QString &encoding)
 {
   QTextCodec *codec;
   bool found = false;
   if (encoding.isEmpty())
   {
     codec = s_global->codec();
-#ifdef DECODE_DEBUG
-    kWarning()<<"defaulting to " << codec->name();
-#endif
     found=true;
   }
   else
@@ -449,14 +446,9 @@
     return false;
 
   configStart ();
-
   m_encodingSet = true;
   m_encoding = codec->name();
-
   configEnd ();
-#ifdef DECODE_DEBUG
-  kWarning()<<"set to " << codec->name();
-#endif
   return true;
 }
 
--- trunk/KDE/kdelibs/kate/utils/kateconfig.h #1100357:1100358
@@ -183,7 +183,7 @@
 
     QTextCodec *codec () const;
     const QString &encoding () const;
-    bool setEncoding (const QString &encoding,bool resetDetection=true);
+    bool setEncoding (const QString &encoding);
     bool isSetEncoding () const;
 
     QTextCodec *fallbackCodec () const;
[prev in list] [next in list] [prev in thread] [next in thread]