File wallch-4.15-qt4-compat.patch of Package wallch
=== modified file 'src/gui/mainwindow.cpp'
--- src/gui/mainwindow.cpp 2015-08-25 17:06:39 +0000
+++ src/gui/mainwindow.cpp 2015-12-23 13:36:31 +0000
@@ -21,7 +21,6 @@
#define QT_NO_KEYWORDS
-#include <QtConcurrent/QtConcurrentRun>
#include <QMimeData>
#include <QDesktopServices>
#include <QRadioButton>
@@ -32,6 +31,11 @@
#include <QStandardItem>
#include <QColorDialog>
#include <QShortcut>
+#if QT_VERSION < 0x050000
+# include <QtConcurrentRun>
+#else
+# include <QtConcurrent/QtConcurrentRun>
+#endif
#ifdef Q_OS_WIN
#include <QtGui/private/qzipreader_p.h>
@@ -322,7 +326,9 @@
void MainWindow::setupTimers(){
//Timer to updates progressbar and launch the changing process
updateSecondsTimer_ = new QTimer(this);
+#if QT_VERSION >= 0x050000
updateSecondsTimer_->setTimerType(Qt::VeryCoarseTimer);
+#endif
connect(updateSecondsTimer_, SIGNAL(timeout()), this, SLOT(updateSeconds()));
//Timer for folder monitoring
@@ -4019,7 +4025,11 @@
currentlyUninstallingWallpaperClock_=true;
+#if QT_VERSION < 0x050000
+ if (!removeDir(gv.defaultWallpaperClock)) {
+#else
if(!QDir(gv.defaultWallpaperClock).removeRecursively()){
+#endif
globalParser_->error("Could not delete wallpaper clock, check folder's and subfolders' permissions.");
}
=== modified file 'src/gui/potd_viewer.cpp'
--- src/gui/potd_viewer.cpp 2015-08-23 16:51:21 +0000
+++ src/gui/potd_viewer.cpp 2015-12-23 13:36:31 +0000
@@ -23,7 +23,11 @@
#include "ui_potd_viewer.h"
#include "glob.h"
+#if QT_VERSION < 0x050000
+#include <QtGui>
+#else
#include <QtWidgets>
+#endif
#include <QtNetwork>
PotdViewer::PotdViewer(QWidget *parent) :
=== modified file 'src/tools/glob.cpp'
--- src/tools/glob.cpp 2015-08-25 14:34:01 +0000
+++ src/tools/glob.cpp 2015-12-23 13:36:31 +0000
@@ -28,12 +28,16 @@
#include <QSettings>
#include <QDirIterator>
#include <QPixmap>
-#include <QtConcurrent/QtConcurrentRun>
#include <QPainter>
#include <QNetworkAccessManager>
#include <QEvent>
#include <QDesktopServices>
#include <QTextDocument>
+#if QT_VERSION < 0x050000
+# include <QtConcurrentRun>
+#else
+# include <QtConcurrent/QtConcurrentRun>
+#endif
#include <iostream>
using namespace std;
@@ -1260,3 +1264,28 @@
{
}
+
+#if QT_VERSION < 0x050000
+bool removeDir(const QString & dirName)
+{
+ bool result = true;
+ QDir dir(dirName);
+
+ if (dir.exists(dirName)) {
+ Q_FOREACH(QFileInfo info, dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst)) {
+ if (info.isDir()) {
+ result = removeDir(info.absoluteFilePath());
+ }
+ else {
+ result = QFile::remove(info.absoluteFilePath());
+ }
+
+ if (!result) {
+ return result;
+ }
+ }
+ result = dir.rmdir(dirName);
+ }
+ return result;
+}
+#endif
=== modified file 'src/tools/glob.h'
--- src/tools/glob.h 2015-08-24 17:15:53 +0000
+++ src/tools/glob.h 2015-12-23 13:36:31 +0000
@@ -33,7 +33,11 @@
#include <QRect>
#include <QProcess>
#include <QNetworkAccessManager>
+#if QT_VERSION < 0x050000
+#include <QDesktopServices>
+#else
#include <QStandardPaths>
+#endif
#include <QSettings>
#include "time.h"
@@ -215,7 +219,11 @@
iconMode(true), rotateImages(false), potdIncludeDescription(true), leEnableTag(false), potdDescriptionBottom(true), wallpaperClocksHourImages(0), refreshhourinterval(0), websiteWaitAfterFinishSeconds(3),
websiteLoadImages(true), websiteJavaEnabled(false), websiteJavascriptCanReadClipboard(false), websiteJavascriptEnabled(true), websiteSimpleAuthEnabled(false),
websiteInterval(6), screenHeight(0), screenWidth(0), potdDescriptionLeftMargin(100), potdDescriptionRightMargin(0), potdDescriptionBottomTopMargin(0), appStartTime(QDateTime::currentDateTime()),
+#if QT_VERSION < 0x050000
+ websiteWebpageToLoad("http://google.com"), defaultPicturesLocation(homePath+"/"+QDesktopServices::displayName(QDesktopServices::PicturesLocation)), potdDescriptionFont("Ubuntu"),
+#else
websiteWebpageToLoad("http://google.com"), defaultPicturesLocation(homePath+"/"+QStandardPaths::displayName(QStandardPaths::PicturesLocation)), potdDescriptionFont("Ubuntu"),
+#endif
defaultIntervals(QList<int>() << 10 << 30 << 60 << 180 << 300 << 600 << 900 << 1200 << 1800 << 2700 << 3600 << 7200 << 10800 << 14400 << 21600 << 43200 << 86400)
{}
};
@@ -296,4 +304,8 @@
Q_SIGNALS:
void updateNotification(QString message, QString image);
};
+
+#if QT_VERSION < 0x050000
+bool removeDir(const QString & dirName);
+#endif
#endif // GLOB_H
=== modified file 'src/tools/nonguimanager.cpp'
--- src/tools/nonguimanager.cpp 2015-08-25 14:34:01 +0000
+++ src/tools/nonguimanager.cpp 2015-12-23 13:36:31 +0000
@@ -21,8 +21,12 @@
#include "nonguimanager.h"
-#include <QtConcurrent/QtConcurrentRun>
#include <QDesktopWidget>
+#if QT_VERSION < 0x050000
+# include <QtConcurrentRun>
+#else
+# include <QtConcurrent/QtConcurrentRun>
+#endif
#include <iostream>
#include <getopt.h>
@@ -748,7 +752,11 @@
connect(clientConnection, SIGNAL(disconnected()), clientConnection, SLOT(deleteLater()));
QDataStream in(clientConnection);
+#if QT_VERSION < 0x050000
+ in.setVersion(QDataStream::Qt_4_6);
+#else
in.setVersion(QDataStream::Qt_5_2);
+#endif
if (clientConnection->bytesAvailable() < (int)sizeof(quint16)) {
return;
}
@@ -777,13 +785,21 @@
void NonGuiManager::socketConnected(){
QByteArray block;
QDataStream out(&block, QIODevice::WriteOnly);
+#if QT_VERSION < 0x050000
+ out.setVersion(QDataStream::Qt_4_6);
+#else
out.setVersion(QDataStream::Qt_5_2);
+#endif
out << messageToSendToServer_;
out.device()->seek(0);
socket_->write(block);
socket_->flush();
if(quitAfterMessagingMainApplication_){
+#if QT_VERSION < 0x050000
+ QTimer::singleShot(100, this, SLOT(quitNow()));
+#else
QTimer::singleShot(100, Qt::CoarseTimer, this, SLOT(quitNow()));
+#endif
}
}
@@ -2135,7 +2151,11 @@
if(settings->value("first-run", true).toBool()){
settings->setValue("first-run", false);
#ifdef Q_OS_UNIX
+#if QT_VERSION < 0x050000
+ if (!removeDir(gv.homePath+"/.config/Wallch/")) {
+#else
if(!QDir(gv.homePath+"/.config/Wallch/").removeRecursively()){
+#endif
Global::error("I probably could not remove previous Wallch configurations!");
}
@@ -2219,7 +2239,11 @@
settings->setValue("windows_major_version", QString::number(osvi.dwMajorVersion));
settings->setValue("windows_minor_version", QString::number(osvi.dwMinorVersion));
+#if QT_VERSION < 0x050000
+ if (!removeDir(QDesktopServices::writableLocation(QDesktopServices::GenericConfigLocation)+"/Mellori Studio/Wallch/")) {
+#else
if(!QDir(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)+"/Mellori Studio/Wallch/").removeRecursively()){
+#endif
Global::error("I probably could not remove previous Wallch configurations!");
}
=== modified file 'src/tools/websitesnapshot.cpp'
--- src/tools/websitesnapshot.cpp 2015-08-24 17:15:53 +0000
+++ src/tools/websitesnapshot.cpp 2015-12-23 13:36:31 +0000
@@ -58,15 +58,17 @@
authenticationLevel_=NoAuthentication;
+#if QT_VERSION >= 0x050000
timeoutTimer_.setTimerType(Qt::VeryCoarseTimer);
+ afterFinishTimer_.setTimerType(Qt::VeryCoarseTimer);
+ priorComplexTimer_.setTimerType(Qt::VeryCoarseTimer);
+#endif
timeoutTimer_.setSingleShot(true);
connect(&timeoutTimer_, SIGNAL(timeout()), this, SLOT(timeoutReached()));
- afterFinishTimer_.setTimerType(Qt::VeryCoarseTimer);
afterFinishTimer_.setSingleShot(true);
connect(&afterFinishTimer_, SIGNAL(timeout()), this, SLOT(afterFinishTimedOut()));
- priorComplexTimer_.setTimerType(Qt::VeryCoarseTimer);
priorComplexTimer_.setSingleShot(true);
connect(&priorComplexTimer_, SIGNAL(timeout()), this, SLOT(proceedToComplexAuth()));
}
@@ -155,7 +157,7 @@
}
void WebsiteSnapshot::parseUrl(QUrl &url){
- QString curUrl=url.url();
+ QString curUrl=url.toString();
if(!curUrl.startsWith("http://") && !curUrl.startsWith("https://")){
curUrl="http://"+curUrl;
url=QUrl(curUrl);
@@ -242,7 +244,7 @@
else
{
if(debug_)
- dbg("The final url is "+urlAfterAuth_.url()+". This is the url that will be loaded after logging in.");
+ dbg("The final url is "+urlAfterAuth_.toString()+". This is the url that will be loaded after logging in.");
//have to go to another page
connect(webPage_, SIGNAL(loadFinished(bool)), this, SLOT(afterAuthNavigation(bool)));
}
@@ -361,7 +363,7 @@
break;
}
if(debug_)
- dbg("Setting viewport size to QSize("+QString::number(minWidth_)+", "+QString::number(minHeight_)+"), and loading "+requestedUrl_.url());
+ dbg("Setting viewport size to QSize("+QString::number(minWidth_)+", "+QString::number(minHeight_)+"), and loading "+requestedUrl_.toString());
webPage_->setViewportSize(QSize(minWidth_, minHeight_));
webPage_->setPreferredContentsSize(QSize(minWidth_, minHeight_));
webPage_->currentFrame()->load(requestedUrl_);
@@ -481,11 +483,11 @@
switch(authenticationLevel_){
default:
case NoAuthentication:
- return requestedUrl_.url();
+ return requestedUrl_.toString();
break;
case SimpleAuthentication:
case ComplexAuthentication:
- return urlAfterAuth_.url();
+ return urlAfterAuth_.toString();
break;
}
}
