CVS commit by marios: * Overloaded URLUtil::isDirectory() for using QStrings * Added "Directory" to VCSFileInfo::FileState M +2 -2 interfaces/kdevvcsfileinfoprovider.h 1.4 M +8 -1 util/urlutil.cpp 1.14 M +1 -0 util/urlutil.h 1.12 --- kdevelop/lib/util/urlutil.cpp #1.13:1.14 @@ -156,5 +156,12 @@ QString URLUtil::extractPathNameAbsolute bool URLUtil::isDirectory( const KURL &url ) { - return QDir( url.path() ).exists(); + return isDirectory( url.path() ); +} + +/////////////////////////////////////////////////////////////////////////////// + +bool URLUtil::isDirectory( const QString &absFilePath ) +{ + return QDir( absFilePath ).exists(); } --- kdevelop/lib/util/urlutil.h #1.11:1.12 @@ -98,4 +98,5 @@ namespace URLUtil */ bool isDirectory( const KURL &url ); + bool isDirectory( const QString &absFilePath ); /** --- kdevelop/lib/interfaces/kdevvcsfileinfoprovider.h #1.3:1.4 @@ -28,5 +28,5 @@ state in respect to repository. struct VCSFileInfo { - enum FileState { Unknown, Added, Uptodate, Modified, Conflict, Sticky }; + enum FileState { Unknown, Added, Uptodate, Modified, Conflict, Sticky, Directory }; VCSFileInfo() {} @@ -73,5 +73,5 @@ public: * @return status for all registered files */ - virtual VCSFileInfoMap status( const QString &dirPath ) const = 0; + virtual const VCSFileInfoMap *status( const QString &dirPath ) const = 0; /**