d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-03 02:14:16 +00:00
Code Issues Projects Releases Wiki Activity

Use QBT_EXT in all places

Browse Source 
Cleanup headers on the way
This commit is contained in:
Chocobo1 2017-02-07 14:07:59 +08:00
parent b18bf48014
commit b9403774e6
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/base/utils/fs.cpp
View File

@ -37,8 +37,9 @@
#include <QDirIterator> #include <QDirIterator>
#include <QCoreApplication> #include <QCoreApplication>
#ifndef Q_OS_WIN #if defined(Q_OS_WIN)
#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) #include <Windows.h>
#elif defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
#include <sys/param.h> #include <sys/param.h>
#include <sys/mount.h> #include <sys/mount.h>
#elif defined(Q_OS_HAIKU) #elif defined(Q_OS_HAIKU)
@ -46,9 +47,8 @@
#else #else
#include <sys/vfs.h> #include <sys/vfs.h>
#endif #endif
#else
#include <Windows.h> #include "base/bittorrent/torrenthandle.h"
#endif
/** /**
* Converts a path to a string suitable for display. * Converts a path to a string suitable for display.
@ -70,7 +70,7 @@ QString Utils::Fs::fromNativePath(const QString &path)
*/ */
QString Utils::Fs::fileExtension(const QString &filename) QString Utils::Fs::fileExtension(const QString &filename)
{ {
QString ext = QString(filename).remove(".!qB"); QString ext = QString(filename).remove(QB_EXT);
const int point_index = ext.lastIndexOf("."); const int point_index = ext.lastIndexOf(".");
return (point_index >= 0) ? ext.mid(point_index + 1) : QString(); return (point_index >= 0) ? ext.mid(point_index + 1) : QString();
} }

2
src/gui/previewselect.cpp
View File

@ -69,7 +69,7 @@ PreviewSelect::PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const t
int nbFiles = torrent->filesCount(); int nbFiles = torrent->filesCount();
for (int i = 0; i < nbFiles; ++i) { for (int i = 0; i < nbFiles; ++i) {
QString fileName = torrent->fileName(i); QString fileName = torrent->fileName(i);
if (fileName.endsWith(".!qB")) if (fileName.endsWith(QB_EXT))
fileName.chop(4); fileName.chop(4);
QString extension = Utils::Fs::fileExtension(fileName).toUpper(); QString extension = Utils::Fs::fileExtension(fileName).toUpper();
if (Utils::Misc::isPreviewable(extension)) { if (Utils::Misc::isPreviewable(extension)) {

4
src/gui/torrentcontentmodelfile.cpp
View File

@ -29,6 +29,8 @@
*/ */
#include "torrentcontentmodelfile.h" #include "torrentcontentmodelfile.h"
#include "base/bittorrent/torrenthandle.h"
#include "torrentcontentmodelfolder.h" #include "torrentcontentmodelfolder.h"
TorrentContentModelFile::TorrentContentModelFile(const QString &fileName, qulonglong fileSize, TorrentContentModelFile::TorrentContentModelFile(const QString &fileName, qulonglong fileSize,
@ -41,7 +43,7 @@ TorrentContentModelFile::TorrentContentModelFile(const QString &fileName, qulong
m_name = fileName; m_name = fileName;
// Do not display incomplete extensions // Do not display incomplete extensions
if (m_name.endsWith(".!qB")) if (m_name.endsWith(QB_EXT))
m_name.chop(4); m_name.chop(4);
m_size = fileSize; m_size = fileSize;

5
src/gui/torrentcontentmodelfolder.cpp
View File

@ -28,16 +28,17 @@
* Contact : chris@qbittorrent.org * Contact : chris@qbittorrent.org
*/ */
#include <QDebug>
#include "torrentcontentmodelfolder.h" #include "torrentcontentmodelfolder.h"
#include "base/bittorrent/torrenthandle.h"
TorrentContentModelFolder::TorrentContentModelFolder(const QString &name, TorrentContentModelFolder *parent) TorrentContentModelFolder::TorrentContentModelFolder(const QString &name, TorrentContentModelFolder *parent)
: TorrentContentModelItem(parent) : TorrentContentModelItem(parent)
{ {
Q_ASSERT(parent); Q_ASSERT(parent);
m_name = name; m_name = name;
// Do not display incomplete extensions // Do not display incomplete extensions
if (m_name.endsWith(".!qB")) if (m_name.endsWith(QB_EXT))
m_name.chop(4); m_name.chop(4);
} }