[Pkg-owncloud-commits] [owncloud-client] 02/89: Replace Q_OS_WIN32 by Q_OS_WIN
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Dec 14 01:02:27 UTC 2013
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 99fc570267067dd468830c6f208da4925b9aa7c6
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Tue Dec 3 16:23:49 2013 +0100
Replace Q_OS_WIN32 by Q_OS_WIN
Fixes #1238
---
src/mirall/accountsettings.cpp | 4 ++--
src/mirall/application.cpp | 2 +-
src/mirall/owncloudgui.cpp | 2 +-
src/mirall/updatedetector.cpp | 2 +-
src/mirall/utility.cpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp
index eb254c5..fd6074e 100644
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@ -390,7 +390,7 @@ void AccountSettings::slotFolderOpenAction( const QString& alias )
QUrl url(f->path(), QUrl::TolerantMode);
url.setScheme( QLatin1String("file") );
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
// work around a bug in QDesktopServices on Win32, see i-net
QString filePath = f->path();
@@ -490,7 +490,7 @@ void AccountSettings::slotUpdateFolderState( Folder *folder )
//void AccountSettings::slotOCInfo( const QString& url, const QString& versionStr, const QString& version, const QString& )
//{
-//#ifdef Q_OS_WIN32
+//#ifdef Q_OS_WIN
// // work around a bug in QDesktopServices on Win32, see i-net
// QString filePath = url;
diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index c1435ca..7dfbb32 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -69,7 +69,7 @@ QString applicationTrPath()
#ifdef Q_OS_MAC
return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
#endif
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
return QApplication::applicationDirPath();
#endif
}
diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index 770ed38..ad10da2 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -326,7 +326,7 @@ void ownCloudGui::slotFolderOpenAction( const QString& alias )
QUrl url(f->path(), QUrl::TolerantMode);
url.setScheme( QLatin1String("file") );
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
// work around a bug in QDesktopServices on Win32, see i-net
QString filePath = f->path();
diff --git a/src/mirall/updatedetector.cpp b/src/mirall/updatedetector.cpp
index 82376df..42be36d 100644
--- a/src/mirall/updatedetector.cpp
+++ b/src/mirall/updatedetector.cpp
@@ -48,7 +48,7 @@ void UpdateDetector::versionCheck( Theme *theme )
#ifdef Q_OS_LINUX
platform = QLatin1String("linux");
#endif
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
platform = QLatin1String( "win32" );
#endif
#ifdef Q_OS_MAC
diff --git a/src/mirall/utility.cpp b/src/mirall/utility.cpp
index 7916127..c23152f 100644
--- a/src/mirall/utility.cpp
+++ b/src/mirall/utility.cpp
@@ -104,7 +104,7 @@ QString Utility::octetsToString( qint64 octets )
// Qtified version of get_platforms() in csync_owncloud.c
QString Utility::platform()
{
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN)
return QLatin1String("Windows");
#elif defined(Q_OS_MAC)
return QLatin1String("Macintosh");
--
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