d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 04:54:18 +00:00
Code Issues Projects Releases Wiki Activity

Minor code clean up

Browse Source
This commit is contained in:
Christophe Dumez 2012-08-25 16:34:00 +03:00
parent d2a6887248
commit d62554aaba
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainwindow.cpp
View File

@ -107,7 +107,7 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa
// Setting icons // Setting icons
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
if (Preferences().useSystemIconTheme()) if (Preferences().useSystemIconTheme())
setWindowIcon(QIcon::fromTheme("qbittorrent", QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); setWindowIcon(QIcon::fromTheme("qbittorrent", QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))));
else else
#else #else
setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
@ -712,7 +712,7 @@ void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e) {
return; return;
} }
// Make sure the window is not minimized // Make sure the window is not minimized
setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive); setWindowState(windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
// Then show it // Then show it
show(); show();
raise(); raise();

15
src/qtlibtorrent/torrentmodel.cpp
View File

@ -37,14 +37,15 @@
using namespace libtorrent; using namespace libtorrent;
TorrentModelItem::TorrentModelItem(const QTorrentHandle &h) TorrentModelItem::TorrentModelItem(const QTorrentHandle &h)
: m_torrent(h)
, m_addedTime(TorrentPersistentData::getAddedDate(h.hash()))
, m_seedTime(TorrentPersistentData::getSeedDate(h.hash()))
, m_label(TorrentPersistentData::getLabel(h.hash()))
, m_name(TorrentPersistentData::getName(h.hash()))
, m_hash(h.hash())
{ {
m_torrent = h; if (m_name.isEmpty())
m_hash = h.hash(); m_name = h.name();
m_name = TorrentPersistentData::getName(h.hash());
if (m_name.isEmpty()) m_name = h.name();
m_addedTime = TorrentPersistentData::getAddedDate(h.hash());
m_seedTime = TorrentPersistentData::getSeedDate(h.hash());
m_label = TorrentPersistentData::getLabel(h.hash());
} }
TorrentModelItem::State TorrentModelItem::state() const TorrentModelItem::State TorrentModelItem::state() const

16
src/qtlibtorrent/trackerinfos.h
View File

@ -40,13 +40,19 @@ public:
unsigned long num_peers; unsigned long num_peers;
//TrackerInfos() {} //TrackerInfos() {}
TrackerInfos(const TrackerInfos &b) { TrackerInfos(const TrackerInfos &b)
name_or_url = b.name_or_url; : name_or_url(b.name_or_url)
, last_message(b.last_message)
, num_peers(b.num_peers)
{
Q_ASSERT(!name_or_url.isEmpty()); Q_ASSERT(!name_or_url.isEmpty());
last_message = b.last_message;
num_peers = b.num_peers;
} }
TrackerInfos(QString name_or_url): name_or_url(name_or_url), last_message(""), num_peers(0) {
TrackerInfos(QString name_or_url)
: name_or_url(name_or_url)
, last_message("")
, num_peers(0)
{
} }
}; };

4
src/qtsingleapp/qtlockedfile.cpp
View File

@ -88,12 +88,12 @@
*/ */
QtLockedFile::QtLockedFile() QtLockedFile::QtLockedFile()
: QFile() : QFile()
, m_lock_mode(NoLock)
{ {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
wmutex = 0; wmutex = 0;
rmutex = 0; rmutex = 0;
#endif #endif
m_lock_mode = NoLock;
} }
/*! /*!
@ -105,12 +105,12 @@ QtLockedFile::QtLockedFile()
*/ */
QtLockedFile::QtLockedFile(const QString &name) QtLockedFile::QtLockedFile(const QString &name)
: QFile(name) : QFile(name)
, m_lock_mode(NoLock)
{ {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
wmutex = 0; wmutex = 0;
rmutex = 0; rmutex = 0;
#endif #endif
m_lock_mode = NoLock;
} }
/*! /*!

2
src/webui/httpresponsegenerator.h
View File

@ -37,7 +37,7 @@
class HttpResponseGenerator : public QHttpResponseHeader class HttpResponseGenerator : public QHttpResponseHeader
{ {
public: public:
void setMessage(const QByteArray& message); void setMessage(const QByteArray& message);
void setMessage(const QString& message); void setMessage(const QString& message);
void setContentTypeByExt(const QString& ext); void setContentTypeByExt(const QString& ext);