Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp (revision 76299) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp (revision 76300) @@ -205,5 +205,5 @@ << changeTime << fsInfo.GetUserName() << permissionString(fsInfo); - FileObjectType fsObjectType = fileType(fsInfo); + KFsObjType fsObjectType = fileType(fsInfo); UIFileTableItem *item = new UIFileTableItem(data, parent, fsObjectType); @@ -211,15 +211,15 @@ continue; item->setPath(UIPathOperations::mergePaths(strPath, fsInfo.GetName())); - if (fsObjectType == FileObjectType_Directory) + if (fsObjectType == KFsObjType_Directory) { directories.insert(fsInfo.GetName(), item); item->setIsOpened(false); } - else if(fsObjectType == FileObjectType_File) + else if(fsObjectType == KFsObjType_File) { files.insert(fsInfo.GetName(), item); item->setIsOpened(false); } - else if(fsObjectType == FileObjectType_SymLink) + else if(fsObjectType == KFsObjType_Symlink) { files.insert(fsInfo.GetName(), item); @@ -267,10 +267,10 @@ { CGuestFsObjInfo fileInfo = m_comGuestSession.FsObjQueryInfo(strPath, true); - FileObjectType eType = fileType(fileInfo); - if (eType == FileObjectType_File || eType == FileObjectType_SymLink) + KFsObjType eType = fileType(fileInfo); + if (eType == KFsObjType_File || eType == KFsObjType_Symlink) { m_comGuestSession.FsObjRemove(strPath); } - else if (eType == FileObjectType_Directory) + else if (eType == KFsObjType_Directory) { QVector flags(KDirectoryRemoveRecFlag_ContentAndDir); @@ -391,30 +391,30 @@ } -FileObjectType UIFileManagerGuestTable::fileType(const CFsObjInfo &fsInfo) +KFsObjType UIFileManagerGuestTable::fileType(const CFsObjInfo &fsInfo) { if (fsInfo.isNull() || !fsInfo.isOk()) - return FileObjectType_Unknown; + return KFsObjType_Unknown; if (fsInfo.GetType() == KFsObjType_Directory) - return FileObjectType_Directory; + return KFsObjType_Directory; else if (fsInfo.GetType() == KFsObjType_File) - return FileObjectType_File; + return KFsObjType_File; else if (fsInfo.GetType() == KFsObjType_Symlink) - return FileObjectType_SymLink; - - return FileObjectType_Other; -} - -FileObjectType UIFileManagerGuestTable::fileType(const CGuestFsObjInfo &fsInfo) + return KFsObjType_Symlink; + + return KFsObjType_Unknown; +} + +KFsObjType UIFileManagerGuestTable::fileType(const CGuestFsObjInfo &fsInfo) { if (fsInfo.isNull() || !fsInfo.isOk()) - return FileObjectType_Unknown; + return KFsObjType_Unknown; if (fsInfo.GetType() == KFsObjType_Directory) - return FileObjectType_Directory; + return KFsObjType_Directory; else if (fsInfo.GetType() == KFsObjType_File) - return FileObjectType_File; + return KFsObjType_File; else if (fsInfo.GetType() == KFsObjType_Symlink) - return FileObjectType_SymLink; - - return FileObjectType_Other; + return KFsObjType_Symlink; + + return KFsObjType_Unknown; } @@ -530,9 +530,9 @@ } - FileObjectType type = fileType(fileInfo); - - if (type == FileObjectType_File) + KFsObjType type = fileType(fileInfo); + + if (type == KFsObjType_File) ++fileCount; - if (type == FileObjectType_Directory) + if (type == KFsObjType_Directory) ++directoryCount; totalSize += fileInfo.GetObjectSize(); @@ -569,5 +569,5 @@ // bool createWorkerThread = (selectedObjects.size() > 1); // if (!createWorkerThread && - // fileType(m_comGuestSession.FsObjQueryInfo(selectedObjects[0], true)) == FileObjectType_Directory) + // fileType(m_comGuestSession.FsObjQueryInfo(selectedObjects[0], true)) == KFsObjType_Directory) // createWorkerThread = true; // if (createWorkerThread) Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.h (revision 76299) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.h (revision 76300) @@ -73,6 +73,6 @@ private: - FileObjectType fileType(const CFsObjInfo &fsInfo); - FileObjectType fileType(const CGuestFsObjInfo &fsInfo); + KFsObjType fileType(const CFsObjInfo &fsInfo); + KFsObjType fileType(const CGuestFsObjInfo &fsInfo); void prepareActionConnections(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp (revision 76299) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp (revision 76300) @@ -276,10 +276,10 @@ { bool deleteSuccess = true; - FileObjectType eType = fileType(QFileInfo(strPath)); - if (eType == FileObjectType_File || eType == FileObjectType_SymLink) + KFsObjType eType = fileType(QFileInfo(strPath)); + if (eType == KFsObjType_File || eType == KFsObjType_Symlink) { deleteSuccess = QDir().remove(strPath); } - else if (eType == FileObjectType_Directory) + else if (eType == KFsObjType_Directory) { QDir itemToDelete(strPath); @@ -330,18 +330,18 @@ } -FileObjectType UIFileManagerHostTable::fileType(const QFileInfo &fsInfo) +KFsObjType UIFileManagerHostTable::fileType(const QFileInfo &fsInfo) { if (!fsInfo.exists()) - return FileObjectType_Unknown; + return KFsObjType_Unknown; /* first check if it is symlink becacuse for Qt being smylin and directory/file is not mutually exclusive: */ if (fsInfo.isSymLink()) - return FileObjectType_SymLink; + return KFsObjType_Symlink; else if (fsInfo.isFile()) - return FileObjectType_File; + return KFsObjType_File; else if (fsInfo.isDir()) - return FileObjectType_Directory; - - return FileObjectType_Other; + return KFsObjType_Directory; + + return KFsObjType_Unknown; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.h (revision 76299) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.h (revision 76300) @@ -37,5 +37,5 @@ protected: - FileObjectType fileType(const QFileInfo &fsInfo); + KFsObjType fileType(const QFileInfo &fsInfo); void retranslateUi() /* override */; virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) /* override */; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp (revision 76299) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp (revision 76300) @@ -460,5 +460,5 @@ UIFileTableItem::UIFileTableItem(const QVector &data, - UIFileTableItem *parent, FileObjectType type) + UIFileTableItem *parent, KFsObjType type) : m_itemData(data) , m_parentItem(parent) @@ -539,15 +539,15 @@ bool UIFileTableItem::isDirectory() const { - return m_type == FileObjectType_Directory; + return m_type == KFsObjType_Directory; } bool UIFileTableItem::isSymLink() const { - return m_type == FileObjectType_SymLink; + return m_type == KFsObjType_Symlink; } bool UIFileTableItem::isFile() const { - return m_type == FileObjectType_File; + return m_type == KFsObjType_File; } @@ -591,5 +591,5 @@ } -FileObjectType UIFileTableItem::type() const +KFsObjType UIFileTableItem::type() const { return m_type; @@ -864,8 +864,8 @@ QVector headData; headData.resize(UICustomFileSystemModelColumn_Max); - m_pRootItem = new UIFileTableItem(headData, 0, FileObjectType_Directory); + m_pRootItem = new UIFileTableItem(headData, 0, KFsObjType_Directory); UIFileTableItem* startItem = new UIFileTableItem(createTreeItemData(startPath, 4096, QDateTime(), "" /* owner */, "" /* permissions */), - m_pRootItem, FileObjectType_Directory); + m_pRootItem, KFsObjType_Directory); startItem->setPath(startPath); m_pRootItem->appendChild(startItem); @@ -892,5 +892,5 @@ UIFileTableItem* driveItem = new UIFileTableItem(createTreeItemData(m_driveLetterList[i], 4096, QDateTime(), QString(), QString()), - startItem, FileObjectType_Directory); + startItem, KFsObjType_Directory); driveItem->setPath(m_driveLetterList[i]); startItem->appendChild(driveItem); @@ -915,5 +915,5 @@ UIFileTableItem *item = new UIFileTableItem(createTreeItemData(UICustomFileSystemModel::strUpDirectoryString, 4096, QDateTime(), QString(), QString()) - , parent, FileObjectType_Directory); + , parent, KFsObjType_Directory); item->setIsOpened(false); map.insert(UICustomFileSystemModel::strUpDirectoryString, item); @@ -1452,24 +1452,21 @@ } -QString UIFileManagerTable::fileTypeString(FileObjectType type) +QString UIFileManagerTable::fileTypeString(KFsObjType type) { QString strType = UIFileManager::tr("Unknown"); switch (type) { - case FileObjectType_File: + case KFsObjType_File: strType = UIFileManager::tr("File"); break; - case FileObjectType_Directory: + case KFsObjType_Directory: strType = UIFileManager::tr("Directory"); break; - case FileObjectType_SymLink: + case KFsObjType_Symlink: strType = UIFileManager::tr("Symbolic Link"); break; - case FileObjectType_Other: - strType = UIFileManager::tr("Other"); - break; - - case FileObjectType_Unknown: + case KFsObjType_Unknown: default: + strType = UIFileManager::tr("Unknown"); break; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h (revision 76299) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h (revision 76300) @@ -52,15 +52,4 @@ class UIToolBar; -/** @todo r=bird: Why don't you just use KFsObjType? */ -enum FileObjectType -{ - FileObjectType_File = 0, - FileObjectType_Directory, - FileObjectType_SymLink, - FileObjectType_Other, - FileObjectType_Unknown, - FileObjectType_Max -}; - /** A simple struck to store some statictics for a directory. Mainly used by UIDirectoryDiskUsageComputer instances. */ class UIDirectoryStatistics @@ -170,5 +159,5 @@ * directory */ explicit UIFileTableItem(const QVector &data, - UIFileTableItem *parentItem, FileObjectType type); + UIFileTableItem *parentItem, KFsObjType type); ~UIFileTableItem(); @@ -199,5 +188,5 @@ void clearChildren(); - FileObjectType type() const; + KFsObjType type() const; const QString &targetPath() const; @@ -232,5 +221,5 @@ /** True if this is a symlink and the target is a directory */ bool m_isTargetADirectory; - FileObjectType m_type; + KFsObjType m_type; /** True if only this item represents a DOS style drive letter item */ bool m_isDriveItem; @@ -331,5 +320,5 @@ /** @} */ - QString fileTypeString(FileObjectType type); + QString fileTypeString(KFsObjType type); /* @p item index is item location in model not in 'proxy' model */ void goIntoDirectory(const QModelIndex &itemIndex);