diff --git a/src/defines.pri b/src/defines.pri index 657cc4d00..e7618dbeb 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -15,7 +15,7 @@ win32 { LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib } -DEFINES *= QT_NO_URL_CAST_FROM_STRING +DEFINES *= QT_NO_URL_CAST_FROM_STRING QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION ##It won't compile on windows with this define. Some bug in qtsingleapp / qvector template !win32: !CONFIG(debug, debug|release): DEFINES *= QT_NO_DEBUG_OUTPUT diff --git a/src/lib/data/html/speeddial.html b/src/lib/data/html/speeddial.html index e32b5b8d6..db1fd9e88 100644 --- a/src/lib/data/html/speeddial.html +++ b/src/lib/data/html/speeddial.html @@ -46,8 +46,7 @@ span.reload:hover {border-color: grey; border-radius: 4px;} #settingsBox .rowsel span {font-weight: bold;text-align: center;margin: 2px;margin-right: 7px;display: inline-block;width: 25px;} .buttonbox {margin-top: 5px;margin-bottom:-5px;text-align:right;} -/*.buttonbox input {margin-left:3px; margin-right:0;padding:0;}*/ -.overlay { background:-webkit-radial-gradient(rgba(127, 127, 127, 0.5),rgba(127, 127, 127, 0.5) 35%,rgba(0, 0, 0, 0.7));bottom:0;left: 0;padding: 20px;padding-bottom: 130px;position: fixed;right:0;top:0;} +.overlay {background:rgba(128,128,128,0.8);background:-webkit-radial-gradient(rgba(127, 127, 127, 0.5),rgba(127, 127, 127, 0.5) 35%,rgba(0, 0, 0, 0.7));bottom:0;left: 0;padding: 20px;padding-bottom: 130px;position: fixed;right:0;top:0;} diff --git a/src/lib/downloads/downloadmanager.cpp b/src/lib/downloads/downloadmanager.cpp index b5d718765..664f37a15 100644 --- a/src/lib/downloads/downloadmanager.cpp +++ b/src/lib/downloads/downloadmanager.cpp @@ -74,7 +74,7 @@ void DownloadManager::loadSettings() Settings settings; settings.beginGroup("DownloadManager"); m_downloadPath = settings.value("defaultDownloadPath", "").toString(); - m_lastDownloadPath = settings.value("lastDownloadPath", QDir::homePath() + "/").toString(); + m_lastDownloadPath = settings.value("lastDownloadPath", QDir::homePath().append("/")).toString(); m_closeOnFinish = settings.value("CloseManagerOnFinish", false).toBool(); m_useNativeDialog = settings.value("useNativeDialog", DEFAULT_USE_NATIVE_DIALOG).toBool(); diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp index 072479178..09eb89465 100644 --- a/src/lib/network/networkmanager.cpp +++ b/src/lib/network/networkmanager.cpp @@ -187,15 +187,15 @@ void NetworkManager::sslError(QNetworkReply* reply, QList errors) } QSslCertificate cert = error.certificate(); - certs.append(""); + certs += ""; } QString text2 = tr("Would you like to make an exception for this certificate?"); diff --git a/src/lib/other/aboutdialog.cpp b/src/lib/other/aboutdialog.cpp index d180568bc..2a0d4039b 100644 --- a/src/lib/other/aboutdialog.cpp +++ b/src/lib/other/aboutdialog.cpp @@ -55,18 +55,18 @@ void AboutDialog::showAbout() { ui->authorsButton->setText(tr("Authors and Contributors")); if (m_aboutHtml.isEmpty()) { - m_aboutHtml.append("
"); - m_aboutHtml.append(tr("

Application version %1
").arg(QupZilla::VERSION + m_aboutHtml += "

"; + m_aboutHtml += tr("

Application version %1
").arg(QupZilla::VERSION #ifdef GIT_REVISION + " (" + GIT_REVISION + ")" #endif - )); - m_aboutHtml.append(tr("WebKit version %1

").arg(QupZilla::WEBKITVERSION)); - m_aboutHtml.append(QString("

© %1 %2
").arg(QupZilla::COPYRIGHT, QupZilla::AUTHOR)); - m_aboutHtml.append(tr("Build time: %1

").arg(QupZilla::BUILDTIME)); - m_aboutHtml.append(QString("

%1

").arg(QupZilla::WWWADDRESS)); - m_aboutHtml.append("

" + mApp->getWindow()->weView()->webPage()->userAgentForUrl(QUrl()) + "

"); - m_aboutHtml.append("
"); + ); + m_aboutHtml += tr("WebKit version %1

").arg(QupZilla::WEBKITVERSION); + m_aboutHtml += QString("

© %1 %2
").arg(QupZilla::COPYRIGHT, QupZilla::AUTHOR); + m_aboutHtml += tr("Build time: %1

").arg(QupZilla::BUILDTIME); + m_aboutHtml += QString("

%1

").arg(QupZilla::WWWADDRESS); + m_aboutHtml += "

" + mApp->getWindow()->weView()->webPage()->userAgentForUrl(QUrl()) + "

"; + m_aboutHtml += "
"; } ui->textBrowser->setHtml(m_aboutHtml); } @@ -75,17 +75,17 @@ void AboutDialog::showAuthors() { ui->authorsButton->setText(tr("< About QupZilla")); if (m_authorsHtml.isEmpty()) { - m_authorsHtml.append("
"); - m_authorsHtml.append(tr("

Main developer:
%1 <%2>

").arg(QupZilla::AUTHOR, "nowrep@gmail.com")); - m_authorsHtml.append(tr("

Contributors:
%1

").arg( + m_authorsHtml += "
"; + m_authorsHtml += tr("

Main developer:
%1 <%2>

").arg(QupZilla::AUTHOR, "nowrep@gmail.com"); + m_authorsHtml += tr("

Contributors:
%1

").arg( QString::fromUtf8("Mladen Pejaković
" "Bryan M Dunsmore
" "Mariusz Fik
" "Jan Rajnoha
" "Daniele Cocca") - )); + ); - m_authorsHtml.append(tr("

Translators:
%1

").arg( + m_authorsHtml += tr("

Translators:
%1

").arg( QString::fromUtf8("Heimen Stoffels
" "Peter Vacula
" "Jonathan Hooverman
" @@ -110,9 +110,10 @@ void AboutDialog::showAuthors() "Daiki Noda
" "Gábor Oberle
" "Piccoro McKay Lenz") - )); - m_authorsHtml.append("
"); + ); + m_authorsHtml += "
"; } + ui->textBrowser->setHtml(m_authorsHtml); } diff --git a/src/lib/tools/globalfunctions.cpp b/src/lib/tools/globalfunctions.cpp index a7319c46c..62063cbb4 100644 --- a/src/lib/tools/globalfunctions.cpp +++ b/src/lib/tools/globalfunctions.cpp @@ -164,13 +164,11 @@ QString qz_urlEncodeQueryString(const QUrl &url) QString returnString = url.toString(QUrl::RemoveQuery | QUrl::RemoveFragment); if (url.hasQuery()) { - returnString.append("?"); - returnString.append(url.encodedQuery()); + returnString += "?" + url.encodedQuery(); } if (url.hasFragment()) { - returnString.append("#"); - returnString.append(url.encodedFragment()); + returnString += "#" + url.encodedFragment(); } returnString.replace(" ", "%20"); diff --git a/src/lib/webview/webview.cpp b/src/lib/webview/webview.cpp index c9ab2628c..bdfc9c9ec 100644 --- a/src/lib/webview/webview.cpp +++ b/src/lib/webview/webview.cpp @@ -685,7 +685,7 @@ void WebView::createPageContextMenu(QMenu* menu, const QPoint &pos) if (url().scheme() == "http" || url().scheme() == "https") { // bool result = validateConfirm(tr("Do you want to upload this page to an online source code validator?")); // if (result) - menu->addAction(tr("Validate page"), this, SLOT(openUrlInSelectedTab()))->setData("http://validator.w3.org/check?uri=" + url().toString()); + menu->addAction(tr("Validate page"), this, SLOT(openUrlInSelectedTab()))->setData(QUrl("http://validator.w3.org/check?uri=" + url().toString())); } menu->addAction(QIcon::fromTheme("text-html"), tr("Show so&urce code"), this, SLOT(showSource())); @@ -757,7 +757,7 @@ void WebView::createSelectedTextContextMenu(QMenu* menu, const QWebHitTestResult connect(gtwact, SIGNAL(middleClicked()), this, SLOT(openUrlInBackgroundTab())); menu->addAction(gtwact); Action* dictact = new Action(QIcon::fromTheme("accessories-dictionary"), tr("Dictionary")); - dictact->setData("http://" + (langCode != "" ? langCode + "." : langCode) + "wiktionary.org/wiki/Special:Search?search=" + selectedText); + dictact->setData(QUrl("http://" + (langCode != "" ? langCode + "." : langCode) + "wiktionary.org/wiki/Special:Search?search=" + selectedText)); connect(dictact, SIGNAL(triggered()), this, SLOT(openUrlInSelectedTab())); connect(dictact, SIGNAL(middleClicked()), this, SLOT(openUrlInBackgroundTab())); menu->addAction(dictact); diff --git a/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp b/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp index f571cf934..007a7f6c2 100644 --- a/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp +++ b/src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp @@ -107,7 +107,7 @@ void QjtMouseGestureFilter::addGesture(QjtMouseGesture* gesture) { Gesture::DirectionList dl; - for (DirectionList::const_iterator source = gesture->directions().begin(); source != gesture->directions().end(); ++source) { + for (DirectionList::const_iterator source = gesture->directions().constBegin(); source != gesture->directions().end(); ++source) { dl.push_back(*source); } @@ -120,7 +120,7 @@ void QjtMouseGestureFilter::addGesture(QjtMouseGesture* gesture) void QjtMouseGestureFilter::clearGestures(bool deleteGestures) { if (deleteGestures) - for (GestureList::const_iterator i = d->gestures.begin(); i != d->gestures.end(); ++i) { + for (GestureList::const_iterator i = d->gestures.constBegin(); i != d->gestures.constEnd(); ++i) { delete *i; } diff --git a/translations/translations.pri b/translations/translations.pri index 5b5330353..94b7e8b92 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -21,7 +21,6 @@ TRANSLATIONS += $$PWD/cs_CZ.ts\ $$PWD/ja_JP.ts\ $$PWD/ro_RO.ts\ $$PWD/hu_HU.ts\ - $$PWD/es_VE.ts\ updateqm.input = TRANSLATIONS updateqm.output = $$PWD/../bin/locale/${QMAKE_FILE_BASE}.qm