aboutsummaryrefslogtreecommitdiffstats
path: root/src/kvilib/file/KviFileUtils.cpp
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2015-08-27 04:16:03 +0200
committerGravatar Szymon Tomasz Stefanek2015-08-27 04:16:03 +0200
commitb59a43f57ecc290d6798a29402256c169f5b1bd2 (patch)
tree33a115a647c2a8acdf38181026b141407dc12ffd /src/kvilib/file/KviFileUtils.cpp
parentMerge branch 'master' of https://github.com/kvirc/KVIrc (diff)
downloadKVIrc-b59a43f57ecc290d6798a29402256c169f5b1bd2.tar.gz
KVIrc-b59a43f57ecc290d6798a29402256c169f5b1bd2.tar.bz2
KVIrc-b59a43f57ecc290d6798a29402256c169f5b1bd2.zip
More work on theme packing
Diffstat (limited to 'src/kvilib/file/KviFileUtils.cpp')
-rw-r--r--src/kvilib/file/KviFileUtils.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp
index 3d0f762c6..268cb7b8a 100644
--- a/src/kvilib/file/KviFileUtils.cpp
+++ b/src/kvilib/file/KviFileUtils.cpp
@@ -355,8 +355,13 @@ namespace KviFileUtils
return readFile(szPath,szBuffer,uMaxSize);
}
- QString extractFileName(const QString & szFileNameWithPath)
+ QString extractFileName(const QString & szFileNameWithPath,bool bAllowEmpty)
{
+ if(!bAllowEmpty)
+ {
+ if(szFileNameWithPath.endsWith(KVI_PATH_SEPARATOR))
+ return QFileInfo(szFileNameWithPath.left(szFileNameWithPath.length() - 1)).fileName();
+ }
return QFileInfo(szFileNameWithPath).fileName();
}