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

Merge pull request #7358 from Chocobo1/qstringbuilder

Browse Source 
Improve compile defines
This commit is contained in:
Mike Tzou 2017-08-29 16:42:09 +08:00 committed by GitHub
commit 5efb4b522f
11 changed files with 124 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Modules/winconf.cmake
View File

@ -24,6 +24,7 @@ add_definitions(-DUNICODE
-D_WIN32_IE=0x0501
-D_CRT_SECURE_NO_DEPRECATE
-D_SCL_SECURE_NO_DEPRECATE
-DNOMINMAX
)
# and boost
set(Boost_USE_STATIC_LIBS True)

7
src/CMakeLists.txt
View File

@ -40,11 +40,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
# defines
add_definitions(-DQT_NO_CAST_TO_ASCII)
# Fast concatenation (Qt >= 4.6)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
if (WIN32)
add_definitions(-DNOMINMAX)
endif (WIN32)
# Efficient construction for QString & QByteArray (Qt >= 4.8)
add_definitions(-DQT_USE_QSTRINGBUILDER)
if (NOT GUI)
add_definitions(-DDISABLE_GUI -DDISABLE_COUNTRIES_RESOLUTION)

12
src/base/net/smtp.cpp
View File

@ -194,7 +194,7 @@ void Smtp::readyRead()
ehlo();
}
else {
logError("Connection failed, unrecognized reply: " + line);
logError(QLatin1String("Connection failed, unrecognized reply: ") + line);
m_state = Close;
}
break;
@ -231,7 +231,7 @@ void Smtp::readyRead()
}
else {
// Authentication failed!
logError("Authentication failed, msg: " + line);
logError(QLatin1String("Authentication failed, msg: ") + line);
m_state = Close;
}
break;
@ -242,7 +242,7 @@ void Smtp::readyRead()
m_state = Data;
}
else {
logError("<mail from> was rejected by server, msg: " + line);
logError(QLatin1String("<mail from> was rejected by server, msg: ") + line);
m_state = Close;
}
break;
@ -253,7 +253,7 @@ void Smtp::readyRead()
m_state = Body;
}
else {
logError("<Rcpt to> was rejected by server, msg: " + line);
logError(QLatin1String("<Rcpt to> was rejected by server, msg: ") + line);
m_state = Close;
}
break;
@ -264,7 +264,7 @@ void Smtp::readyRead()
m_state = Quit;
}
else {
logError("<data> was rejected by server, msg: " + line);
logError(QLatin1String("<data> was rejected by server, msg: ") + line);
m_state = Close;
}
break;
@ -276,7 +276,7 @@ void Smtp::readyRead()
m_state = Close;
}
else {
logError("Message was rejected by the server, error: " + line);
logError(QLatin1String("Message was rejected by the server, error: ") + line);
m_state = Close;
}
break;

4
src/gui/about.qrc
View File

@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<RCC>
<qresource prefix="/">
<file>gpl.html</file>
<file>thanks.html</file>
<file>translators.html</file>

2
src/gui/properties/trackersadditiondlg.cpp
View File

@ -105,7 +105,7 @@ void TrackersAdditionDlg::parseUTorrentList(const QString &, const QString &path
m_ui->trackers_list->insertPlainText("\n");
int nb = 0;
while (!list_file.atEnd()) {
const QByteArray line = list_file.readLine().trimmed();
const QString line = list_file.readLine().trimmed();
if (line.isEmpty()) continue;
BitTorrent::TrackerEntry newTracker(line);
if (!existingTrackers.contains(newTracker)) {

36
src/icons.qrc
View File

@ -1,14 +1,6 @@
<RCC>
<qresource prefix="/">
<file>icons/qbittorrent.png</file>
<file>icons/3-state-checkbox.gif</file>
<file>icons/L.gif</file>
<file>icons/loading.png</file>
<file>icons/slow.png</file>
<file>icons/slow_off.png</file>
<file>icons/sphere.png</file>
<file>icons/sphere2.png</file>
<file>icons/url.png</file>
<file>icons/flags/ad.png</file>
<file>icons/flags/ae.png</file>
<file>icons/flags/af.png</file>
@ -250,9 +242,13 @@
<file>icons/flags/za.png</file>
<file>icons/flags/zm.png</file>
<file>icons/flags/zw.png</file>
<file>icons/L.gif</file>
<file>icons/loading.png</file>
<file>icons/qbittorrent.png</file>
<file>icons/qbt-theme/application-exit.png</file>
<file>icons/qbt-theme/application-rss+xml.png</file>
<file>icons/qbt-theme/application-x-mswinurl.png</file>
<file>icons/qbt-theme/checked.png</file>
<file>icons/qbt-theme/configure.png</file>
<file>icons/qbt-theme/dialog-cancel.png</file>
<file>icons/qbt-theme/dialog-information.png</file>
@ -280,7 +276,9 @@
<file>icons/qbt-theme/folder-remote.png</file>
<file>icons/qbt-theme/gear.png</file>
<file>icons/qbt-theme/gear32.png</file>
<file>icons/qbt-theme/go-bottom.png</file>
<file>icons/qbt-theme/go-down.png</file>
<file>icons/qbt-theme/go-top.png</file>
<file>icons/qbt-theme/go-up.png</file>
<file>icons/qbt-theme/help-about.png</file>
<file>icons/qbt-theme/help-contents.png</file>
@ -299,14 +297,17 @@
<file>icons/qbt-theme/network-server.png</file>
<file>icons/qbt-theme/network-wired.png</file>
<file>icons/qbt-theme/object-locked.png</file>
<file>icons/qbt-theme/office-chart-line.png</file>
<file>icons/qbt-theme/preferences-desktop.png</file>
<file>icons/qbt-theme/preferences-other.png</file>
<file>icons/qbt-theme/preferences-system-network.png</file>
<file>icons/qbt-theme/preferences-web-browser-cookies.png</file>
<file>icons/qbt-theme/rss-config.png</file>
<file>icons/qbt-theme/security-high.png</file>
<file>icons/qbt-theme/security-low.png</file>
<file>icons/qbt-theme/services.png</file>
<file>icons/qbt-theme/speedometer.png</file>
<file>icons/qbt-theme/system-log-out.png</file>
<file>icons/qbt-theme/tab-close.png</file>
<file>icons/qbt-theme/task-attention.png</file>
<file>icons/qbt-theme/task-complete.png</file>
@ -332,6 +333,7 @@
<file>icons/skin/bg-panel-header.gif</file>
<file>icons/skin/checking.png</file>
<file>icons/skin/collapse-expand.gif</file>
<file>icons/skin/completed.png</file>
<file>icons/skin/connected.png</file>
<file>icons/skin/disconnected.png</file>
<file>icons/skin/dock-tabs.gif</file>
@ -350,13 +352,14 @@
<file>icons/skin/logo2.gif</file>
<file>icons/skin/mascot.png</file>
<file>icons/skin/paused.png</file>
<file>icons/skin/qbittorrent-tray-dark.svg</file>
<file>icons/skin/qbittorrent-tray-light.svg</file>
<file>icons/skin/qbittorrent16.png</file>
<file>icons/skin/qbittorrent22.png</file>
<file>icons/skin/qbittorrent32.png</file>
<file>icons/skin/qbittorrent-tray-dark.svg</file>
<file>icons/skin/qbittorrent-tray-light.svg</file>
<file>icons/skin/queued.png</file>
<file>icons/skin/ratio.png</file>
<file>icons/skin/resumed.png</file>
<file>icons/skin/seeding.png</file>
<file>icons/skin/slider-area.gif</file>
<file>icons/skin/spacer.gif</file>
@ -368,14 +371,11 @@
<file>icons/skin/tabs.gif</file>
<file>icons/skin/toolbox-divider.gif</file>
<file>icons/skin/toolbox-divider2.gif</file>
<file>icons/skin/resumed.png</file>
<file>icons/skin/uploading.png</file>
<file>icons/skin/completed.png</file>
<file>icons/qbt-theme/system-log-out.png</file>
<file>icons/qbt-theme/go-bottom.png</file>
<file>icons/qbt-theme/go-top.png</file>
<file>icons/qbt-theme/checked.png</file>
<file>icons/qbt-theme/office-chart-line.png</file>
<file>icons/qbt-theme/rss-config.png</file>
<file>icons/slow.png</file>
<file>icons/slow_off.png</file>
<file>icons/sphere.png</file>
<file>icons/sphere2.png</file>
<file>icons/url.png</file>
</qresource>
</RCC>

12
src/lang.qrc
View File

@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<RCC>
<qresource prefix="/">
<file>lang/qbittorrent_ar.qm</file>
<file>lang/qbittorrent_be.qm</file>
<file>lang/qbittorrent_bg.qm</file>
@ -11,8 +11,8 @@
<file>lang/qbittorrent_en.qm</file>
<file>lang/qbittorrent_en_AU.qm</file>
<file>lang/qbittorrent_en_GB.qm</file>
<file>lang/qbittorrent_es.qm</file>
<file>lang/qbittorrent_eo.qm</file>
<file>lang/qbittorrent_es.qm</file>
<file>lang/qbittorrent_eu.qm</file>
<file>lang/qbittorrent_fi.qm</file>
<file>lang/qbittorrent_fr.qm</file>
@ -28,15 +28,15 @@
<file>lang/qbittorrent_ja.qm</file>
<file>lang/qbittorrent_ka.qm</file>
<file>lang/qbittorrent_ko.qm</file>
<file>lang/qbittorrent_lv_LV.qm</file>
<file>lang/qbittorrent_lt.qm</file>
<file>lang/qbittorrent_lv_LV.qm</file>
<file>lang/qbittorrent_ms_MY.qm</file>
<file>lang/qbittorrent_nb.qm</file>
<file>lang/qbittorrent_nl.qm</file>
<file>lang/qbittorrent_oc.qm</file>
<file>lang/qbittorrent_pl.qm</file>
<file>lang/qbittorrent_pt_PT.qm</file>
<file>lang/qbittorrent_pt_BR.qm</file>
<file>lang/qbittorrent_pt_PT.qm</file>
<file>lang/qbittorrent_ro.qm</file>
<file>lang/qbittorrent_ru.qm</file>
<file>lang/qbittorrent_sk.qm</file>
@ -48,7 +48,7 @@
<file>lang/qbittorrent_uz@Latn.qm</file>
<file>lang/qbittorrent_vi.qm</file>
<file>lang/qbittorrent_zh.qm</file>
<file>lang/qbittorrent_zh_TW.qm</file>
<file>lang/qbittorrent_zh_HK.qm</file>
<file>lang/qbittorrent_zh_TW.qm</file>
</qresource>
</RCC>

12
src/searchengine.qrc
View File

@ -1,16 +1,16 @@
<RCC>
<qresource prefix="/">
<file>searchengine/nova/fix_encoding.py</file>
<file>searchengine/nova/helpers.py</file>
<file>searchengine/nova/nova2.py</file>
<file>searchengine/nova/novaprinter.py</file>
<file>searchengine/nova/socks.py</file>
<file>searchengine/nova3/helpers.py</file>
<file>searchengine/nova3/nova2.py</file>
<file>searchengine/nova3/nova2dl.py</file>
<file>searchengine/nova3/novaprinter.py</file>
<file>searchengine/nova3/sgmllib3.py</file>
<file>searchengine/nova3/socks.py</file>
<file>searchengine/nova/fix_encoding.py</file>
<file>searchengine/nova/helpers.py</file>
<file>searchengine/nova/nova2.py</file>
<file>searchengine/nova/nova2dl.py</file>
<file>searchengine/nova3/nova2dl.py</file>
<file>searchengine/nova/novaprinter.py</file>
<file>searchengine/nova/socks.py</file>
</qresource>
</RCC>

33
src/src.pro
View File

@ -6,26 +6,22 @@ CONFIG += qt thread silent
CONFIG += c++11
DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
# Windows specific configuration
# Platform specific configuration
win32: include(../winconf.pri)
# Mac specific configuration
macx: include(../macxconf.pri)
# Unix specific configuration
unix:!macx: include(../unixconf.pri)
# eCS(OS/2) specific configuration
os2: include(../os2conf.pri)
QT += network xml
nogui {
TARGET = qbittorrent-nox
QT -= gui
DEFINES += DISABLE_GUI
TARGET = qbittorrent-nox
} else {
macx: QT += macextras
macx: LIBS += -lobjc
TARGET = qbittorrent
QT += xml concurrent svg widgets
CONFIG(static) {
DEFINES += QBT_STATIC_QT
QTPLUGIN += qico
@ -33,16 +29,19 @@ nogui {
win32 {
QT += winextras
}
TARGET = qbittorrent
macx {
QT += macextras
LIBS += -lobjc
}
}
nowebui {
DEFINES += DISABLE_WEBUI
}
nowebui: DEFINES += DISABLE_WEBUI
strace_win {
DEFINES += STACKTRACE_WIN
DEFINES += STACKTRACE_WIN_PROJECT_PATH=$$PWD
DEFINES += STACKTRACE_WIN_MAKEFILE_PATH=$$OUT_PWD
}
QT += network xml
CONFIG(debug, debug|release): message(Project is built in DEBUG mode.)
CONFIG(release, debug|release): message(Project is built in RELEASE mode.)
@ -57,10 +56,8 @@ CONFIG(release, debug|release) {
include(../version.pri)
DEFINES += QT_NO_CAST_TO_ASCII
# Fast concatenation (Qt >= 4.6)
DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
win32: DEFINES += NOMINMAX
# Efficient construction for QString & QByteArray (Qt >= 4.8)
DEFINES += QT_USE_QSTRINGBUILDER
INCLUDEPATH += $$PWD

30
src/webui/webui.qrc
View File

@ -2,12 +2,24 @@
<qresource prefix="/">
<file>www/private/index.html</file>
<file>www/private/login.html</file>
<file>www/public/about.html</file>
<file>www/public/addtrackers.html</file>
<file>www/public/confirmdeletion.html</file>
<file>www/public/css/Core.css</file>
<file>www/public/css/dynamicTable.css</file>
<file>www/public/css/Layout.css</file>
<file>www/public/css/style.css</file>
<file>www/public/css/Tabs.css</file>
<file>www/public/css/Window.css</file>
<file>www/public/download.html</file>
<file>www/public/downloadlimit.html</file>
<file>www/public/filters.html</file>
<file>www/public/newcategory.html</file>
<file>www/public/preferences.html</file>
<file>www/public/preferences_content.html</file>
<file>www/public/properties.html</file>
<file>www/public/properties_content.html</file>
<file>www/public/rename.html</file>
<file>www/public/scripts/client.js</file>
<file>www/public/scripts/clipboard.min.js</file>
<file>www/public/scripts/contextmenu.js</file>
@ -15,33 +27,21 @@
<file>www/public/scripts/dynamicTable.js</file>
<file>www/public/scripts/excanvas-compressed.js</file>
<file>www/public/scripts/misc.js</file>
<file>www/public/scripts/mocha.js</file>
<file>www/public/scripts/mocha-init.js</file>
<file>www/public/scripts/mocha-yc.js</file>
<file>www/public/scripts/mocha.js</file>
<file>www/public/scripts/mootools-1.2-core-yc.js</file>
<file>www/public/scripts/mootools-1.2-more.js</file>
<file>www/public/scripts/parametrics.js</file>
<file>www/public/scripts/progressbar.js</file>
<file>www/public/about.html</file>
<file>www/public/addtrackers.html</file>
<file>www/public/confirmdeletion.html</file>
<file>www/public/download.html</file>
<file>www/public/downloadlimit.html</file>
<file>www/public/filters.html</file>
<file>www/public/preferences.html</file>
<file>www/public/preferences_content.html</file>
<file>www/public/properties.html</file>
<file>www/public/properties_content.html</file>
<file>www/public/scripts/prop-files.js</file>
<file>www/public/scripts/prop-general.js</file>
<file>www/public/scripts/prop-trackers.js</file>
<file>www/public/scripts/prop-webseeds.js</file>
<file>www/public/scripts/prop-files.js</file>
<file>www/public/setlocation.html</file>
<file>www/public/statistics.html</file>
<file>www/public/transferlist.html</file>
<file>www/public/upload.html</file>
<file>www/public/uploadlimit.html</file>
<file>www/public/newcategory.html</file>
<file>www/public/setlocation.html</file>
<file>www/public/rename.html</file>
</qresource>
</RCC>

1
winconf.pri
View File

@ -49,6 +49,7 @@ DEFINES += _CRT_SECURE_NO_DEPRECATE
DEFINES += _SCL_SECURE_NO_DEPRECATE
DEFINES += __USE_W32_SOCKETS
DEFINES += _FILE_OFFSET_BITS=64
DEFINES += NOMINMAX
CONFIG(debug, debug|release) {
DEFINES += TORRENT_DEBUG