generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

CMakeLists.txt

@@ -237,14 +237,13 @@ set(KDE4_KPARTS_INCLUDES
 
 set(LIBRARY_TYPE SHARED)
 
-# ACL stuff (used in kio/ and kioslaves/)
 macro_optional_find_package(ACL)
 set_package_properties(ACL
     PROPERTIES
     DESCRIPTION "Support for manipulating access control lists"
     URL "ftp://oss.sgi.com/projects/xfs/cmd_tars"
     TYPE RECOMMENDED
-    PURPOSE "STRONGLY RECOMMENDED"
+    PURPOSE "KIO and KIO slaves"
 )
 
 macro_bool_to_01(ACL_FOUND HAVE_LIBACL HAVE_POSIX_ACL)

kcddb/libkcddb/cddb.cpp

@@ -26,7 +26,6 @@
 #include <qstringlist.h>
 
 #include <kdebug.h>
-#include <kstringhandler.h>
 #include <klocale.h>
 
 namespace KCDDB

kdecore/config/kconfiggroup.cpp

@@ -26,7 +26,6 @@
 #include "kconfig.h"
 #include "kconfig_p.h"
 #include "ksharedconfig.h"
-#include "kstringhandler.h"
 #include "kcomponentdata.h"
 #include "kconfigdata.h"
 #include <kdebug.h>

kdecore/text/kstringhandler.cpp

@@ -287,15 +287,11 @@ done:
 
 QString KStringHandler::from8Bit( const char *str )
 {
-  if (!str)
+  if (!str || !*str)
     return QString();
-  if (!*str) {
-    static const QString &emptyString = KGlobal::staticQString(QLatin1String(""));
-    return emptyString;
-  }
-  return KStringHandler::isUtf8( str ) ?
-             QString::fromUtf8( str ) :
-             QString::fromLocal8Bit( str );
+  if (KStringHandler::isUtf8( str ))
+    return QString::fromUtf8( str );
+  return QString::fromLocal8Bit( str );
 }
 
 int KStringHandler::naturalCompare(const QString &_a, const QString &_b, Qt::CaseSensitivity caseSensitivity)

kdeui/colors/kcolorcollection.cpp

@@ -26,7 +26,6 @@
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <ksavefile.h>
-#include <kstringhandler.h>
 
 //BEGIN KColorCollectionPrivate
 class KColorCollectionPrivate

kdeui/itemviews/kcategorizedsortfilterproxymodel.h

@@ -104,14 +104,6 @@ public:
       */
     bool sortCategoriesByNaturalComparison() const;
 
-    /**
-      * Does a natural comparing of the strings. A negative value is returned if \a a
-      * is smaller than \a b. A positive value is returned if \a a is greater than \a b. 0
-      * is returned if both values are equal.
-      * @deprecated
-      * Use KStringHandler::naturalCompare() instead.
-      */
-
 protected:
     /**
       * Overridden from QSortFilterProxyModel. If you are subclassing

kdeui/widgets/ktabwidget.cpp

@@ -23,21 +23,16 @@
 
 #include <QtGui/QApplication>
 #include <QtGui/qevent.h>
-#include <QtGui/qevent.h>
-#include <QtGui/qevent.h>
 #include <QtGui/QStyle>
 #include <QtGui/QStyleOption>
 #include <QtGui/QTextDocument>
-#include <QtGui/qevent.h>
 #include <QtCore/QList>
 
 #include <ksharedconfig.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
-
 #include <ktabbar.h>
-
 #include <kconfiggroup.h>
 
 class KTabWidget::Private

kexiv2/libkexiv2/kexiv2_p.h

@@ -58,7 +58,6 @@
 
 #include <ktemporaryfile.h>
 #include <kencodingdetector.h>
-#include <kstringhandler.h>
 #include <kdeversion.h>
 #include <kdebug.h>
 

kfile/kfileplaceeditdialog.cpp

@@ -31,7 +31,6 @@
 #include <kmimetype.h>
 #include <kio/global.h>
 #include <kprotocolinfo.h>
-#include <kstringhandler.h>
 #include <kurlrequester.h>
 #include <kconfiggroup.h>
 

kio/bookmarks/kbookmarkimporter.cc

@@ -21,7 +21,6 @@
 #include "kbookmarkimporter.h"
 
 #include <kfiledialog.h>
-#include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>

kio/bookmarks/kbookmarkimporter_ie.cc

@@ -21,7 +21,6 @@
 #include "kbookmarkimporter_ie.h"
 
 #include <kfiledialog.h>
-#include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <qtextcodec.h>

kio/bookmarks/kbookmarkimporter_ns.cc

@@ -25,7 +25,6 @@
 #include "kbookmarkexporter.h"
 #include "kbookmarkmanager.h"
 #include <kfiledialog.h>
-#include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>

kio/bookmarks/kbookmarkimporter_opera.cc

@@ -22,7 +22,6 @@
 #include "kbookmarkimporter_opera_p.h"
 
 #include <kfiledialog.h>
-#include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <qtextcodec.h>

kioslave/http/http.cpp

@@ -886,16 +886,7 @@ void HTTPProtocol::davStatList( const KUrl& url, bool stat )
     if ( !href.isNull() ) {
       entry.clear();
 
-      QString urlStr = QUrl::fromPercentEncoding(href.text().toUtf8());
-#if 0 // qt4/kde4 say: it's all utf8...
-      int encoding = remoteEncoding()->encodingMib();
-      if ((encoding == 106) && (!KStringHandler::isUtf8(KUrl::decode_string(urlStr, 4).toLatin1())))
-        encoding = 4; // Use latin1 if the file is not actually utf-8
-
-      KUrl thisURL ( urlStr, encoding );
-#else
-      KUrl thisURL( urlStr );
-#endif
+      KUrl thisURL( QUrl::fromPercentEncoding(href.text().toUtf8()) );
 
       if ( thisURL.isValid() ) {
         QString name = thisURL.fileName();

kparts/browserrun.cpp

@@ -27,7 +27,6 @@
 #include <kio/copyjob.h>
 #include <klocale.h>
 #include <kshell.h>
-#include <kstringhandler.h>
 #include <kmimetypetrader.h>
 #include <ktemporaryfile.h>
 #include <kdebug.h>