Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.1:Update
clipgrab
clipgrab-qt5.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File clipgrab-qt5.patch of Package clipgrab
From: Luigi Baldoni <aloisio@gmx.com> Date: 2017-04-28 09:05:22 +0200 Subject: Build clipgrab against Qt5 Qt4 is unmaintained and using the old QtWebKit for an internet-facing app would be reckless. This patch backports a number of commits from the https://github.com/OpenHelios/clipgrab-qt5 fork in order to use Qt5 libraries instead. --- .gitignore | 10 ++++++++-- clipgrab.cpp | 18 +++++++++++++++++- clipgrab.h | 4 ++++ clipgrab.pro | 26 +++++++++++++++----------- http_handler.cpp | 28 ++++++++++++++++++++++++++++ main.cpp | 29 +++++++++++++++++++++++------ mainwindow.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- mainwindow.h | 10 +++++++++- message_dialog.h | 7 ++++++- notifications.h | 5 +++++ video.cpp | 4 ++++ video.h | 4 ++++ video_dailymotion.cpp | 7 +++++++ video_dailymotion.h | 3 ++- video_facebook.cpp | 3 +++ video_facebook.h | 2 +- video_heuristic.cpp | 8 ++++++++ video_vimeo.h | 11 ++++++++--- video_youtube.cpp | 12 ++++++++++++ video_youtube.h | 14 +++++++++----- 20 files changed, 221 insertions(+), 33 deletions(-) Index: clipgrab-3.6.8/.gitignore =================================================================== --- clipgrab-3.6.8.orig/.gitignore +++ clipgrab-3.6.8/.gitignore @@ -1,12 +1,18 @@ +/debug/ +/release/ *~ .DS_Store -clipgrab.pro.user +clipgrab.pro.user* ClipGrab.app ui_*.h Makefile -*.o +Makefile.Debug +Makefile.Release moc_*.cpp *.autosave qrc_resources.cpp build ClipGrab.xcodeproj +.qmake.stash +clipgrab +moc_predefs.h Index: clipgrab-3.6.8/clipgrab.cpp =================================================================== --- clipgrab-3.6.8.orig/clipgrab.cpp +++ clipgrab-3.6.8/clipgrab.cpp @@ -23,6 +23,13 @@ #include "clipgrab.h" +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) +#include <QMessageBox> +#else +#include <QtWidgets/QMessageBox> +#include <QUrlQuery> +#endif + ClipGrab::ClipGrab() { //* @@ -286,16 +293,25 @@ void ClipGrab::getUpdateInfo() QString firstStarted = settings.value("firstStarted", "").toString(); +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) QUrl updateInfoRequestUrl("https://clipgrab.org/update/" + sys + "/"); +#else + QUrlQuery updateInfoRequestUrl("https://clipgrab.org/update/" + sys + "/"); +#endif updateInfoRequestUrl.addQueryItem("v", this->version); updateInfoRequestUrl.addQueryItem("l", QLocale::system().name().split("_")[0]); if (!firstStarted.isEmpty()) { updateInfoRequestUrl.addQueryItem("t", firstStarted); } - QNetworkRequest updateInfoRequest; +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) updateInfoRequest.setUrl(updateInfoRequestUrl); +#else + QUrl url; + url.setQuery(updateInfoRequestUrl); + updateInfoRequest.setUrl(url); +#endif QNetworkAccessManager* updateInfoNAM = new QNetworkAccessManager; updateInfoNAM->get(updateInfoRequest); connect(updateInfoNAM, SIGNAL(finished(QNetworkReply*)), this, SLOT(parseUpdateInfo(QNetworkReply*))); Index: clipgrab-3.6.8/clipgrab.h =================================================================== --- clipgrab-3.6.8.orig/clipgrab.h +++ clipgrab-3.6.8/clipgrab.h @@ -29,6 +29,10 @@ #include <QtXml> #include <QtDebug> +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) +#include <QtWidgets/QSystemTrayIcon> +#endif + #include "video.h" #include "video_youtube.h" #include "video_vimeo.h" Index: clipgrab-3.6.8/clipgrab.pro =================================================================== --- clipgrab-3.6.8.orig/clipgrab.pro +++ clipgrab-3.6.8/clipgrab.pro @@ -1,16 +1,24 @@ # ##################################################################### # Automatically generated by qmake (2.01a) Mo 26. Okt 18:26:00 2009 # ##################################################################### +CONFIG += debug_and_release TEMPLATE = app -TARGET = clipgrab -DEPENDPATH += . \ - release -INCLUDEPATH += . +QT += core +QT += gui QT += network -QT += webkit QT += xml - +lessThan(QT_MAJOR_VERSION, 5) { + QT += webkit +} else { + QT += webkitwidgets +} +INCLUDEPATH += . # Input +FORMS += mainwindow.ui \ + metadata-dialog.ui \ + update_message.ui \ + message_dialog.ui \ + login_dialog.ui HEADERS += clipgrab.h \ converter.h \ converter_copy.h \ @@ -26,11 +34,6 @@ HEADERS += clipgrab.h \ http_handler.h \ notifications.h \ message_dialog.h -FORMS += mainwindow.ui \ - metadata-dialog.ui \ - update_message.ui \ - message_dialog.ui \ - login_dialog.ui SOURCES += clipgrab.cpp \ converter.cpp \ converter_copy.cpp \ @@ -79,6 +82,7 @@ TRANSLATIONS += clipgrab_bg.ts \ clipgrab_vi.ts \ clipgrab_zh.ts \ clipgrab_strings.ts +TARGET = clipgrab CODECFORTR = UTF-8 win32:RC_FILE = windows_icon.rc macx { Index: clipgrab-3.6.8/http_handler.cpp =================================================================== --- clipgrab-3.6.8.orig/http_handler.cpp +++ clipgrab-3.6.8/http_handler.cpp @@ -45,14 +45,22 @@ QNetworkRequest http_handler::createRequ QNetworkReply* http_handler::addDownload(QString url, bool chunked, QByteArray postData, QStringList segments) { download* newDownload = new download; +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) QNetworkRequest request = createRequest(QUrl::fromEncoded(url.toAscii())); +#else + QNetworkRequest request = createRequest(QUrl::fromEncoded(url.toLatin1())); +#endif newDownload->tempFile = new QTemporaryFile(QDir::tempPath() + "/clipgrab-download-XXXXXX"); newDownload->size = 0; newDownload->redirectLevel = 0; newDownload->chunked = chunked; if (newDownload->chunked) { +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) request.setRawHeader("Range", QString("bytes=0-1397760").toAscii()); +#else + request.setRawHeader("Range", QString("bytes=0-1397760").toLatin1()); +#endif } if (!segments.isEmpty()) { @@ -121,7 +129,11 @@ void http_handler::continueDownload(down //If more parts need to be downloaded else { +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) request.setRawHeader("Range", QString("bytes=" + QString::number(dl->getProgress()) + "-" + QString::number(targetBytes)).toAscii()); +#else + request.setRawHeader("Range", QString("bytes=" + QString::number(dl->getProgress()) + "-" + QString::number(targetBytes)).toLatin1()); +#endif } } @@ -133,7 +145,11 @@ void http_handler::continueDownload(down dl->currentProgress = 0; dl->redirectLevel = 0; qint64 targetBytes = dl->size; +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) request.setRawHeader("Range", QString("bytes=" + QString::number(dl->getProgress()) + "-" + QString::number(targetBytes)).toAscii()); +#else + request.setRawHeader("Range", QString("bytes=" + QString::number(dl->getProgress()) + "-" + QString::number(targetBytes)).toLatin1()); +#endif } @@ -227,7 +243,11 @@ void http_handler::handleNetworkReply(QN dl->redirectLevel = 0; dl->segmentPosition++; +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) QNetworkRequest request = createRequest(QUrl::fromEncoded(dl->segments.at(dl->segmentPosition).toAscii())); +#else + QNetworkRequest request = createRequest(QUrl::fromEncoded(dl->segments.at(dl->segmentPosition).toLatin1())); +#endif dl->progress = dl->getProgress(); dl->currentProgress = 0; dl->reply = this->networkAccessManager->get(request); @@ -381,8 +401,16 @@ QList<QNetworkCookie> http_handler::dese QList<QNetworkCookie> cookies; for (int i = 0; i < serializedCookies.length(); i++) { +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) QString cookieString = QUrl::fromPercentEncoding(serializedCookies.at(i).toAscii()); +#else + QString cookieString = QUrl::fromPercentEncoding(serializedCookies.at(i).toLatin1()); +#endif +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) QList<QNetworkCookie> parsedCookies = QNetworkCookie::parseCookies(cookieString.toAscii()); +#else + QList<QNetworkCookie> parsedCookies = QNetworkCookie::parseCookies(cookieString.toLatin1()); +#endif for (int j = 0; j < parsedCookies.length(); j++) { cookies.append(parsedCookies.at(j)); Index: clipgrab-3.6.8/main.cpp =================================================================== --- clipgrab-3.6.8.orig/main.cpp +++ clipgrab-3.6.8/main.cpp @@ -19,9 +19,14 @@ along with ClipGrab. If not, see <http://www.gnu.org/licenses/>. */ - - +#include <qglobal.h> +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) #include <QtGui/QApplication> +#include <QSplashScreen> +#else +#include <QtWidgets/QApplication> +#include <QtWidgets/QSplashScreen> +#endif #include <QTranslator> #include "mainwindow.h" #include "clipgrab.h" @@ -39,8 +44,8 @@ int main(int argc, char *argv[]) QCoreApplication::setApplicationName("ClipGrab"); QCoreApplication::setApplicationVersion(QString(STRINGIZE_VALUE_OF(CLIPGRAB_VERSION)).replace("\"", "")); QSplashScreen splash(QPixmap(":/img/splash.png"), Qt::FramelessWindowHint); - QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); +// QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); +// QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); splash.setMask(QPixmap(":/img/splash.png").mask()); @@ -69,10 +74,22 @@ int main(int argc, char *argv[]) } MainWindow w; + splash.finish(&w); w.cg = &cg; w.init(); - w.show(); - splash.finish(w.centralWidget()); + if ("" != settings.value("x", "")) + { + w.move(settings.value("x").toInt(), settings.value("y").toInt()); + w.resize(settings.value("width").toInt(), settings.value("height").toInt()); + } + if (settings.value("isMaximized", false).toBool()) + { + w.showMaximized(); + } + else + { + w.show(); + } cg.getUpdateInfo(); return app.exec(); } Index: clipgrab-3.6.8/mainwindow.cpp =================================================================== --- clipgrab-3.6.8.orig/mainwindow.cpp +++ clipgrab-3.6.8/mainwindow.cpp @@ -23,7 +23,23 @@ #include "mainwindow.h" +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) +#include <QSystemTrayIcon> +#include <QShortcut> +#include <QFileDialog> +#include <QMessageBox> +#else +#include <QtWidgets/QSystemTrayIcon> +#include <QtWidgets/QShortcut> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QMessageBox> +#endif + +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) MainWindow::MainWindow(QWidget *parent, Qt::WFlags flags) +#else +MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) +#endif : QMainWindow(parent, flags) { ui.setupUi(this); @@ -34,6 +50,14 @@ MainWindow::MainWindow(QWidget *parent, MainWindow::~MainWindow() { + QSettings settings; + settings.setValue("isMaximized", isMaximized()); + if (!isMaximized()) { // the position and size is only valid if not maximized + settings.setValue("x", x()); + settings.setValue("y", y()); + settings.setValue("width", width()); + settings.setValue("height", height()); + } } void MainWindow::init() @@ -64,9 +88,14 @@ void MainWindow::init() connect(ui.downloadLineEdit, SIGNAL(textChanged(QString)), cg, SLOT(determinePortal(QString))); connect(this, SIGNAL(itemToRemove(int)), cg, SLOT(removeDownload(int))); //connect(ui.downloadTree, SIGNAL(doubleClicked(QModelIndex)), this, openFinishedVideo(QModelIndex)); +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) ui.downloadTree->header()->setResizeMode(1, QHeaderView::Stretch); - ui.downloadTree->header()->setStretchLastSection(false); ui.downloadTree->header()->setResizeMode(3, QHeaderView::ResizeToContents); +#else + ui.downloadTree->header()->setSectionResizeMode(1, QHeaderView::Stretch); + ui.downloadTree->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents); +#endif + ui.downloadTree->header()->setStretchLastSection(false); ui.downloadLineEdit->setFocus(Qt::OtherFocusReason); int lastFormat = cg->settings.value("LastFormat", 0).toInt(); @@ -99,7 +128,11 @@ void MainWindow::init() connect(this->ui.settingsRadioNotificationsNever, SIGNAL(toggled(bool)), this, SLOT(settingsNotifications_toggled(bool))); +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) this->ui.settingsSavedPath->setText(cg->settings.value("savedPath", QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)).toString()); +#else + this->ui.settingsSavedPath->setText(cg->settings.value("savedPath", QStandardPaths::standardLocations(QStandardPaths::DesktopLocation)).toString()); +#endif this->ui.settingsSaveLastPath->setChecked(cg->settings.value("saveLastPath", true).toBool()); ui.settingsNeverAskForPath->setChecked(cg->settings.value("NeverAskForPath", false).toBool()); @@ -238,7 +271,11 @@ void MainWindow::init() void MainWindow::startDownload() { +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) QString targetDirectory = cg->settings.value("savedPath", QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)).toString(); +#else + QString targetDirectory = cg->settings.value("savedPath", QStandardPaths::standardLocations(QStandardPaths::DesktopLocation)).toString(); +#endif QString fileName = currentVideo->getSaveTitle(); if (cg->settings.value("NeverAskForPath", false).toBool() == false) @@ -563,6 +600,7 @@ void MainWindow::on_settingsNeverAskForP if (exitBox->exec() == QMessageBox::Yes) { cg->cancelAll(); + systemTrayIcon.hide(); event->accept(); } else @@ -572,6 +610,7 @@ void MainWindow::on_settingsNeverAskForP } else { + systemTrayIcon.hide(); event->accept();; } } @@ -665,9 +704,17 @@ void MainWindow::timerEvent(QTimerEvent if (downloadProgress.first != 0 && downloadProgress.second != 0) { #ifdef Q_WS_X11 +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) systemTrayIcon.setToolTip("<strong style=\"font-size:14px\">" + tr("ClipGrab") + "</strong><br /><span style=\"font-size:13px\">" + QString::number(downloadProgress.first*100/downloadProgress.second) + " %</span><br />" + QString::number((double)downloadProgress.first/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB") + "/" + QString::number((double)downloadProgress.second/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB")); +#else + systemTrayIcon.setToolTip("<strong style=\"font-size:14px\">" + tr("ClipGrab") + "</strong><br /><span style=\"font-size:13px\">" + QString::number(downloadProgress.first*100/downloadProgress.second) + " %</span><br />" + QString::number((double)downloadProgress.first/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB") + "/" + QString::number((double)downloadProgress.second/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB")); +#endif #else +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) systemTrayIcon.setToolTip(tr("ClipGrab") + " - " + QString::number(downloadProgress.first*100/downloadProgress.second) + " % - " + QString::number((double)downloadProgress.first/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB") + "/" + QString::number((double)downloadProgress.second/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" KiB")); +#else + systemTrayIcon.setToolTip(tr("ClipGrab") + " - " + QString::number(downloadProgress.first*100/downloadProgress.second) + " % - " + QString::number((double)downloadProgress.first/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB") + "/" + QString::number((double)downloadProgress.second/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" KiB")); +#endif #endif setWindowTitle("ClipGrab - " + QString::number(downloadProgress.first*100/downloadProgress.second) + " %"); } Index: clipgrab-3.6.8/mainwindow.h =================================================================== --- clipgrab-3.6.8.orig/mainwindow.h +++ clipgrab-3.6.8/mainwindow.h @@ -24,10 +24,14 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QtGui/QMainWindow> #include <QSignalMapper> #include <QtXml> #include <QUrl> +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) +#include <QMainWindow> +#else +#include <QtWidgets/QMainWindow> +#endif #include "ui_mainwindow.h" #include "ui_metadata-dialog.h" #include "clipgrab.h" @@ -43,7 +47,11 @@ class MainWindow : public QMainWindow Q_OBJECT public: +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) MainWindow(QWidget *parent = 0, Qt::WFlags flags = 0); +#else + MainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); +#endif ~MainWindow(); void init(); Index: clipgrab-3.6.8/message_dialog.h =================================================================== --- clipgrab-3.6.8.orig/message_dialog.h +++ clipgrab-3.6.8/message_dialog.h @@ -1,9 +1,14 @@ #ifndef MESSAGE_DIALOG_H #define MESSAGE_DIALOG_H +#include <QtGui/QDesktopServices> +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) #include <QDialog> #include <QWebPage> -#include <QDesktopServices> +#else +#include <QtWidgets/QDialog> +#include <QtWebKitWidgets/QWebPage> +#endif namespace Ui { class messageDialog; Index: clipgrab-3.6.8/notifications.h =================================================================== --- clipgrab-3.6.8.orig/notifications.h +++ clipgrab-3.6.8/notifications.h @@ -25,6 +25,11 @@ #define FOO_H #include <QtGui> +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) +#include <QSystemTrayIcon> +#else +#include <QtWidgets/QSystemTrayIcon> +#endif #ifdef Q_WS_MAC64 #include "notifications_mac.h" Index: clipgrab-3.6.8/video.cpp =================================================================== --- clipgrab-3.6.8.orig/video.cpp +++ clipgrab-3.6.8/video.cpp @@ -195,7 +195,11 @@ void video::changeProgress(qint64 bytesR this->_progressBar->setFormat("%p%"); this->_progressBar->setMaximum(bytesTotal); this->_progressBar->setValue(bytesReceived); +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) setToolTip("<strong>" + tr("Downloading ...") + "</strong><br />" + QString::number((double)(bytesReceived)/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB") + "/" + QString::number((double)bytesTotal/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB")); +#else + setToolTip("<strong>" + tr("Downloading ...") + "</strong><br />" + QString::number((double)(bytesReceived)/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB") + "/" + QString::number((double)bytesTotal/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB")); +#endif } } else Index: clipgrab-3.6.8/video.h =================================================================== --- clipgrab-3.6.8.orig/video.h +++ clipgrab-3.6.8/video.h @@ -26,6 +26,10 @@ #include <QtGui> #include <QtNetwork> +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) +#include <QtWidgets/QTreeWidgetItem> +#include <QtWidgets/QProgressBar> +#endif #include "converter.h" #include "converter_ffmpeg.h" #include "http_handler.h" Index: clipgrab-3.6.8/video_dailymotion.cpp =================================================================== --- clipgrab-3.6.8.orig/video_dailymotion.cpp +++ clipgrab-3.6.8/video_dailymotion.cpp @@ -22,6 +22,9 @@ #include "video_dailymotion.h" +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) + #include <QtWebKitWidgets/QtWebKitWidgets> +#endif video_dailymotion::video_dailymotion() { @@ -73,7 +76,7 @@ void video_dailymotion::parseVideo(QStri _title = QString(expression.cap(1)); _title = _title.replace(QRegExp("- Dailymotion$"), ""); - html = QUrl::fromEncoded(html.toAscii()).toString(QUrl::None); + html = QUrl::fromEncoded(html.toLatin1()).toString(QUrl::None); expression = QRegExp("var __PLAYER_CONFIG__\\s*=\\s*(\\{.+\\});"); expression.setMinimal(true); Index: clipgrab-3.6.8/video_dailymotion.h =================================================================== --- clipgrab-3.6.8.orig/video_dailymotion.h +++ clipgrab-3.6.8/video_dailymotion.h @@ -23,8 +23,9 @@ #ifndef VIDEO_DAILYMOTION_H #define VIDEO_DAILYMOTION_H + +#include <QtWebKit/QtWebKit> #include "video.h" -#include "QtWebKit" struct dailymotion_quality { Index: clipgrab-3.6.8/video_facebook.cpp =================================================================== --- clipgrab-3.6.8.orig/video_facebook.cpp +++ clipgrab-3.6.8/video_facebook.cpp @@ -22,6 +22,9 @@ #include "video_facebook.h" +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) + #include <QtWebKitWidgets/QtWebKitWidgets> +#endif video_facebook::video_facebook() { Index: clipgrab-3.6.8/video_facebook.h =================================================================== --- clipgrab-3.6.8.orig/video_facebook.h +++ clipgrab-3.6.8/video_facebook.h @@ -24,9 +24,9 @@ #ifndef VIDEO_FACEBOOK_H #define VIDEO_FACEBOOK_H +#include <QtWebKit/QtWebKit> #include "video.h" #include "ui_login_dialog.h" -#include "QtWebKit" class video_facebook : public video { Index: clipgrab-3.6.8/video_heuristic.cpp =================================================================== --- clipgrab-3.6.8.orig/video_heuristic.cpp +++ clipgrab-3.6.8/video_heuristic.cpp @@ -124,7 +124,11 @@ void video_heuristic::parseVideo(QString { videoQuality newQuality; newQuality.containerName = expression.cap(2).prepend("."); +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) newQuality.videoUrl = QUrl::fromPercentEncoding(expression.cap(1).toAscii()); +#else + newQuality.videoUrl = QUrl::fromPercentEncoding(expression.cap(1).toLatin1()); +#endif newQuality.quality = tr("normal"); _supportedQualities.append(newQuality); emit analysingFinished(); @@ -138,7 +142,11 @@ void video_heuristic::parseVideo(QString { videoQuality newQuality; newQuality.containerName = expression.cap(2).prepend("."); +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) newQuality.videoUrl = QUrl::fromPercentEncoding(expression.cap(1).toAscii()); +#else + newQuality.videoUrl = QUrl::fromPercentEncoding(expression.cap(1).toLatin1()); +#endif newQuality.quality = tr("normal"); _supportedQualities.append(newQuality); emit analysingFinished(); Index: clipgrab-3.6.8/video_vimeo.h =================================================================== --- clipgrab-3.6.8.orig/video_vimeo.h +++ clipgrab-3.6.8/video_vimeo.h @@ -24,10 +24,15 @@ #ifndef video_vimeo_H #define video_vimeo_H +#include <qglobal.h> +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) +#include <QWebPage> +#include <QWebFrame> +#include <QWebElement> +#else +#include <QtWebKitWidgets/QtWebKitWidgets> +#endif #include "video.h" -#include "QWebPage" -#include "QWebFrame" -#include "QWebElement" #include "ui_login_dialog.h" class video_vimeo : public video Index: clipgrab-3.6.8/video_youtube.cpp =================================================================== --- clipgrab-3.6.8.orig/video_youtube.cpp +++ clipgrab-3.6.8/video_youtube.cpp @@ -22,7 +22,11 @@ #include "video_youtube.h" + #include "QMutableListIterator" +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) + #include <QtWebKitWidgets/QtWebKitWidgets> +#endif video_youtube::video_youtube() { @@ -103,7 +107,11 @@ QString video_youtube::getUrlFromFmtLink if (urlExpression.indexIn(link) > -1) { +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) QString url = QUrl::fromEncoded(QUrl::fromEncoded(urlExpression.cap(1).toAscii()).toString().toAscii()).toString(); +#else + QString url = QUrl::fromPercentEncoding(QUrl::fromPercentEncoding(urlExpression.cap(1).toUtf8()).toUtf8()); +#endif QRegExp sigExpression; sigExpression = QRegExp("(?:^|[^a-zA-Z])[,]?s(ig)?=([^,]+)"); @@ -663,7 +671,11 @@ void video_youtube::parseVideo(QString h { videoQuality newQuality; newQuality.quality = tr("normal"); +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) newQuality.videoUrl = QUrl::fromEncoded(QString("http://www.youtube.com/get_video?video_id=" + expression2.cap(1) + "&t=" + expression.cap(1)).toAscii()).toString(QUrl::None); +#else + newQuality.videoUrl = QUrl::fromEncoded(QString("http://www.youtube.com/get_video?video_id=" + expression2.cap(1) + "&t=" + expression.cap(1)).toLatin1()).toString(QUrl::None); +#endif _supportedQualities.append(newQuality); } else Index: clipgrab-3.6.8/video_youtube.h =================================================================== --- clipgrab-3.6.8.orig/video_youtube.h +++ clipgrab-3.6.8/video_youtube.h @@ -24,13 +24,17 @@ #ifndef video_YOUTUBE_H #define video_YOUTUBE_H -#include "video.h" -#include "QtWebKit" +#include <qglobal.h> +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) +#include <QtWebKit> +#else +#include <QtWebKit/QtWebKit> +#endif #include <QtGui> -#include "QDomDocument" +#include <QFile> +#include <QDomDocument> #include "ui_login_dialog.h" - -#include "QFile" +#include "video.h" struct fmtQuality {
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
