KDE/kdelibs/kio

[David Faure]

SVN commit 588613 by dfaure:

KDirModel, a directory model for KIO-based directory listings.
 Handles files being created, modified and deleted at runtime.
 With unit tests and a gui test program (which creates QListViews and a QTreeView to test it)
 The model has been tested with 10000 subdirs and the branch opens as fast as it did in kde3 times.

CCMAIL: kde-core-devel at kde.org


 M  +2 -1      CMakeLists.txt  
 A             kio/kdirmodel.cpp   [License: no copyright]
 A             kio/kdirmodel.h   [License: LGPL (v2+)]
 M  +2 -1      kio/kfileitem.cpp  
 M  +33 -0     tests/CMakeLists.txt  
 A             tests/kdirmodeltest.cpp   [License: LGPL (v2)]
 A             tests/kdirmodeltest.h   [License: no copyright]
 A             tests/kdirmodeltest_gui.cpp   [License: LGPL (v2)]
 A             tests/kfileitemtest.cpp   [License: LGPL (v2)]
 A             tests/kfileitemtest.h   [License: no copyright]


--- trunk/KDE/kdelibs/kio/CMakeLists.txt #588612:588613
@@ -121,6 +121,7 @@
   kio/kmimetypechooser.cpp
   kio/kbuildsycocaprogressdialog.cpp
   kio/safesite.cpp
+  kio/kdirmodel.cpp
 )
 
 set(kiocore_STAT_SRCS ${kiocore_STAT_SRCS} ${CMAKE_SOURCE_DIR}/kio/misc/uiserveriface.cpp)
@@ -260,8 +261,8 @@
 endif(ACL_FOUND)
 
 set_target_properties(kio PROPERTIES VERSION 5.0.0 SOVERSION 5 )
+
 ########### install files ###############
-
 install(TARGETS kio  DESTINATION ${LIB_INSTALL_DIR} )
 
 install( PROGRAMS useragent.pl proxytype.pl  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
--- trunk/KDE/kdelibs/kio/kio/kfileitem.cpp #588612:588613
@@ -434,6 +434,7 @@
     KUrl url = mostLocalUrl(isLocalUrl);
 
     m_pMimeType = KMimeType::findByUrl( url, m_fileMode, isLocalUrl );
+    Q_ASSERT(m_pMimeType);
     //kDebug() << "finding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl;
     m_bMimeTypeKnown = true;
   }
@@ -498,7 +499,7 @@
     }
   }
 
-  if ( m_pMimeType->name() == "application/x-gzip" && m_url.fileName().endsWith( QLatin1String( ".gz" ) ) )
+  if ( mimetype() == "application/x-gzip" && m_url.fileName().endsWith( QLatin1String( ".gz" ) ) )
      _state |= K3Icon::ZipOverlay;
   return _state;
 }
--- trunk/KDE/kdelibs/kio/tests/CMakeLists.txt #588612:588613
@@ -336,7 +336,18 @@
 
 add_test(kio-kmimetypetest ${EXECUTABLE_OUTPUT_PATH}/kmimetypetest)
 
+########### next target ###############
 
+set(kfileitemtest_SRCS kfileitemtest.cpp)
+
+kde4_automoc(${kfileitemtest_SRCS})
+
+kde4_add_executable(kfileitemtest NOGUI RUN_UNINSTALLED ${kfileitemtest_SRCS})
+
+target_link_libraries(kfileitemtest ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY} )
+
+add_test(kio-kfileitemtest ${EXECUTABLE_OUTPUT_PATH}/kfileitemtest)
+
 ########### next target ###############
 
 set(kbookmarktest_SRCS kbookmarktest.cpp)
@@ -370,7 +381,29 @@
 
 target_link_libraries(kdirwatchtest_gui ${KDE4_KIO_LIBS})
 
+########### next target ###############
 
+set(kdirmodeltest_SRCS kdirmodeltest.cpp)
+
+kde4_automoc(${kdirmodeltest_SRCS})
+
+kde4_add_executable(kdirmodeltest RUN_UNINSTALLED ${kdirmodeltest_SRCS})
+
+target_link_libraries(kdirmodeltest ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY} )
+
+add_test(kio-kdirmodeltest ${EXECUTABLE_OUTPUT_PATH}/kdirmodeltest)
+
+########### next target ###############
+
+set(kdirmodeltest_gui_SRCS kdirmodeltest_gui.cpp)
+
+kde4_automoc(${kdirmodeltest_gui_SRCS})
+
+kde4_add_executable(kdirmodeltest_gui RUN_UNINSTALLED ${kdirmodeltest_gui_SRCS})
+
+target_link_libraries(kdirmodeltest_gui ${KDE4_KIO_LIBS})
+
+
 endif(KDE4_BUILD_TESTS)
 
 ########### install files ###############