[Pkg-owncloud-commits] [owncloud-client] 09/164: Fix build when compiling libsync without QtGui
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sun Mar 22 11:55:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 151228b2a61d77c8d48b8a1b6733a731113115f6
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Mon Feb 16 10:24:42 2015 +0100
Fix build when compiling libsync without QtGui
Utility must stay QtGui-free, move the hidpiFileName to the theme which
is the only part in libsync which uses it, and already has #ifdefs
---
src/gui/sslbutton.cpp | 5 +++--
src/gui/wizard/owncloudadvancedsetuppage.cpp | 2 +-
src/gui/wizard/owncloudsetuppage.cpp | 4 ++--
src/gui/wizard/owncloudwizardresultpage.cpp | 3 +--
src/libsync/owncloudtheme.cpp | 3 +--
src/libsync/theme.cpp | 25 +++++++++++++++++++++++
src/libsync/theme.h | 3 +++
src/libsync/utility.cpp | 30 ++--------------------------
src/libsync/utility.h | 5 -----
9 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/src/gui/sslbutton.cpp b/src/gui/sslbutton.cpp
index 1988763..226dc54 100644
--- a/src/gui/sslbutton.cpp
+++ b/src/gui/sslbutton.cpp
@@ -15,6 +15,7 @@
#include "account.h"
#include "accountstate.h"
#include "utility.h"
+#include "theme.h"
#include <QMenu>
#include <QUrl>
@@ -184,7 +185,7 @@ void SslButton::updateAccountState(AccountState *accountState)
oldMenu->deleteLater(); // setMenu do not delete the previous menu.
}
if (account->url().scheme() == QLatin1String("https")) {
- setIcon(QIcon(QPixmap(Utility::hidpiFileName(":/client/resources/lock-https.png"))));
+ setIcon(QIcon(QPixmap(Theme::hidpiFileName(":/client/resources/lock-https.png"))));
QSslCipher cipher = account->sslConfiguration().sessionCipher();
setToolTip(tr("This connection is encrypted using %1 bit %2.\n").arg(cipher.usedBits()).arg(cipher.name()));
QMenu *menu = new QMenu(this);
@@ -217,7 +218,7 @@ void SslButton::updateAccountState(AccountState *accountState)
}
setMenu(menu);
} else {
- setIcon(QIcon(QPixmap(Utility::hidpiFileName(":/client/resources/lock-http.png"))));
+ setIcon(QIcon(QPixmap(Theme::hidpiFileName(":/client/resources/lock-http.png"))));
setToolTip(tr("This connection is NOT secure as it is not encrypted.\n"));
}
}
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
index 61b41f8..290e2c4 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -67,7 +67,7 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage()
_ui.lServerIcon->setText(QString());
_ui.lServerIcon->setPixmap(appIcon.pixmap(48));
_ui.lLocalIcon->setText(QString());
- _ui.lLocalIcon->setPixmap(QPixmap(Utility::hidpiFileName(":/client/resources/folder-sync.png")));
+ _ui.lLocalIcon->setPixmap(QPixmap(Theme::hidpiFileName(":/client/resources/folder-sync.png")));
}
void OwncloudAdvancedSetupPage::setupCustomization()
diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
index aaed85c..90690c6 100644
--- a/src/gui/wizard/owncloudsetuppage.cpp
+++ b/src/gui/wizard/owncloudsetuppage.cpp
@@ -116,11 +116,11 @@ void OwncloudSetupPage::slotUrlChanged(const QString& url)
}
if (url.startsWith(QLatin1String("http://"))) {
- _ui.urlLabel->setPixmap(QPixmap(Utility::hidpiFileName(":/client/resources/lock-http.png")));
+ _ui.urlLabel->setPixmap(QPixmap(Theme::hidpiFileName(":/client/resources/lock-http.png")));
_ui.urlLabel->setToolTip(tr("This url is NOT secure as it is not encrypted.\n"
"It is not advisable to use it."));
} else {
- _ui.urlLabel->setPixmap(QPixmap(Utility::hidpiFileName(":/client/resources/lock-https.png")));
+ _ui.urlLabel->setPixmap(QPixmap(Theme::hidpiFileName(":/client/resources/lock-https.png")));
_ui.urlLabel->setToolTip(tr("This url is secure. You can use it."));
}
}
diff --git a/src/gui/wizard/owncloudwizardresultpage.cpp b/src/gui/wizard/owncloudwizardresultpage.cpp
index 005bf79..55cbf32 100644
--- a/src/gui/wizard/owncloudwizardresultpage.cpp
+++ b/src/gui/wizard/owncloudwizardresultpage.cpp
@@ -21,7 +21,6 @@
#include "wizard/owncloudwizardresultpage.h"
#include "wizard/owncloudwizardcommon.h"
#include "theme.h"
-#include "utility.h"
namespace OCC
{
@@ -41,7 +40,7 @@ OwncloudWizardResultPage::OwncloudWizardResultPage()
setSubTitle( QLatin1String(" ") );
_ui.pbOpenLocal->setText(tr("Open Local Folder"));
- _ui.pbOpenLocal->setIcon(QIcon(Utility::hidpiFileName(":/client/resources/folder-sync.png")));
+ _ui.pbOpenLocal->setIcon(QIcon(Theme::hidpiFileName(":/client/resources/folder-sync.png")));
_ui.pbOpenLocal->setIconSize(QSize(48, 48));
_ui.pbOpenLocal->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
connect(_ui.pbOpenLocal, SIGNAL(clicked()), SLOT(slotOpenLocal()));
diff --git a/src/libsync/owncloudtheme.cpp b/src/libsync/owncloudtheme.cpp
index 372d339..73ec81f 100644
--- a/src/libsync/owncloudtheme.cpp
+++ b/src/libsync/owncloudtheme.cpp
@@ -25,7 +25,6 @@
#include <QCoreApplication>
#include <QDebug>
-#include "utility.h"
#include "version.h"
#include "config.h"
@@ -108,7 +107,7 @@ QColor ownCloudTheme::wizardHeaderTitleColor() const
QPixmap ownCloudTheme::wizardHeaderLogo() const
{
- return QPixmap(Utility::hidpiFileName(":/client/theme/colored/wizard_logo.png"));
+ return QPixmap(hidpiFileName(":/client/theme/colored/wizard_logo.png"));
}
#endif
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 533a242..6de3572 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -155,6 +155,31 @@ QIcon Theme::themeIcon( const QString& name, bool sysTray ) const
return icon;
}
+QString Theme::hidpiFileName(const QString &fileName, QPaintDevice *dev)
+{
+ #if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+ qreal devicePixelRatio = dev ? dev->devicePixelRatio() :
+ qApp->primaryScreen()->devicePixelRatio();
+ if (devicePixelRatio <= 1.0) {
+ return fileName;
+ }
+ // try to find a 2x version
+
+
+
+ const int dotIndex = fileName.lastIndexOf(QLatin1Char('.'));
+ if (dotIndex != -1) {
+ QString at2xfileName = fileName;
+ at2xfileName.insert(dotIndex, QStringLiteral("@2x"));
+ if (QFile::exists(at2xfileName)) {
+ return at2xfileName;
+ }
+ }
+ #endif
+ return fileName;
+}
+
+
#endif
Theme::Theme() :
diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index fbd4be0..061060e 100644
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -23,6 +23,7 @@ class QString;
class QObject;
class QPixmap;
class QColor;
+class QPaintDevice;
namespace OCC {
@@ -80,6 +81,8 @@ public:
virtual QString configFileName() const = 0;
#ifndef TOKEN_AUTH_ONLY
+ static QString hidpiFileName(const QString &fileName, QPaintDevice *dev = 0);
+
/**
* the icon that is shown in the tray context menu left of the folder name
*/
diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp
index 98c1b94..ce9aa2e 100644
--- a/src/libsync/utility.cpp
+++ b/src/libsync/utility.cpp
@@ -16,7 +16,8 @@
#include "version.h"
-#include <QApplication>
+// Note: This file must compile without QtGui
+#include <QCoreApplication>
#include <QSettings>
#include <QTextStream>
#include <QDir>
@@ -27,8 +28,6 @@
#include <QThread>
#include <QDateTime>
#include <QSysInfo>
-#include <QPaintDevice>
-#include <QScreen>
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#include <QTextDocument>
#else
@@ -446,29 +445,4 @@ quint64 Utility::StopWatch::durationOfLap( const QString& lapName ) const
return _lapTimes.value(lapName, 0);
}
-QString Utility::hidpiFileName(const QString &fileName, QPaintDevice *dev)
-{
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
- qreal devicePixelRatio = dev ? dev->devicePixelRatio() :
- qApp->primaryScreen()->devicePixelRatio();
- if (devicePixelRatio <= 1.0) {
- return fileName;
- }
- // try to find a 2x version
-
-
-
- const int dotIndex = fileName.lastIndexOf(QLatin1Char('.'));
- if (dotIndex != -1) {
- QString at2xfileName = fileName;
- at2xfileName.insert(dotIndex, QStringLiteral("@2x"));
- if (QFile::exists(at2xfileName)) {
- return at2xfileName;
- }
- }
-#endif
-
- return fileName;
-}
-
} // namespace OCC
diff --git a/src/libsync/utility.h b/src/libsync/utility.h
index a8a1f20..a9e8bb7 100644
--- a/src/libsync/utility.h
+++ b/src/libsync/utility.h
@@ -22,9 +22,6 @@
#include <QElapsedTimer>
#include <QHash>
-class QPaintDevice;
-class QWidget;
-
namespace OCC {
namespace Utility
@@ -101,8 +98,6 @@ namespace Utility
// if false, the two cases are two different files.
OWNCLOUDSYNC_EXPORT bool fsCasePreserving();
- OWNCLOUDSYNC_EXPORT QString hidpiFileName(const QString &fileName, QPaintDevice *dev = 0);
-
class OWNCLOUDSYNC_EXPORT StopWatch {
private:
QHash<QString, quint64> _lapTimes;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list