Browse Source

Merge pull request #5124 from Chocobo1/fix_warnings

Fix warnings
adaptive-webui-19844
sledgehammer999 9 years ago
parent
commit
3be35743ac
  1. 2
      src/base/bittorrent/torrenthandle.cpp
  2. 15
      src/gui/mainwindow.ui
  3. 2
      src/gui/torrentcontentmodel.cpp

2
src/base/bittorrent/torrenthandle.cpp

@ -199,10 +199,10 @@ TorrentHandle::TorrentHandle(Session *session, const libtorrent::torrent_handle
, m_nativeHandle(nativeHandle) , m_nativeHandle(nativeHandle)
, m_state(TorrentState::Unknown) , m_state(TorrentState::Unknown)
, m_renameCount(0) , m_renameCount(0)
, m_useASM(data.savePath.isEmpty())
, m_name(data.name) , m_name(data.name)
, m_savePath(Utils::Fs::toNativePath(data.savePath)) , m_savePath(Utils::Fs::toNativePath(data.savePath))
, m_category(data.category) , m_category(data.category)
, m_useASM(data.savePath.isEmpty())
, m_hasSeedStatus(data.hasSeedStatus) , m_hasSeedStatus(data.hasSeedStatus)
, m_ratioLimit(data.ratioLimit) , m_ratioLimit(data.ratioLimit)
, m_tempPathDisabled(data.disableTempPath) , m_tempPathDisabled(data.disableTempPath)

15
src/gui/mainwindow.ui

@ -35,7 +35,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>914</width> <width>914</width>
<height>21</height> <height>23</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuEdit"> <widget class="QMenu" name="menuEdit">
@ -108,8 +108,6 @@
<addaction name="actionCriticalMessages"/> <addaction name="actionCriticalMessages"/>
</widget> </widget>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionSearch_engine"/>
<addaction name="actionRSS_Reader"/>
<addaction name="menuLog"/> <addaction name="menuLog"/>
<addaction name="actionTopToolBar"/> <addaction name="actionTopToolBar"/>
<addaction name="actionSpeedInTitleBar"/> <addaction name="actionSpeedInTitleBar"/>
@ -355,17 +353,6 @@
<string>P&amp;ause All</string> <string>P&amp;ause All</string>
</property> </property>
</action> </action>
<action name="actionExecutionLogs">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Log</string>
</property>
<property name="toolTip">
<string>Execution Log</string>
</property>
</action>
<action name="actionAutoExit"> <action name="actionAutoExit">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>

2
src/gui/torrentcontentmodel.cpp

@ -285,7 +285,7 @@ void TorrentContentModel::clear()
void TorrentContentModel::setupModelData(const BitTorrent::TorrentInfo &info) void TorrentContentModel::setupModelData(const BitTorrent::TorrentInfo &info)
{ {
qDebug("setup model data called"); qDebug("setup model data called");
if (info.filesCount() == 0) if (info.filesCount() <= 0)
return; return;
emit layoutAboutToBeChanged(); emit layoutAboutToBeChanged();

Loading…
Cancel
Save