[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam/frameworks] /: fix Qt OS macro
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2014-12-31 17:39:15
Message-ID: E1Y6NEp-0006mn-Lb () scm ! kde ! org
[Download RAW message or body]

Git commit 8009b8dabdf8e99f051b09a6ee30f577f3a078a4 by Gilles Caulier.
Committed on 31/12/2014 at 17:39.
Pushed by cgilles into branch 'frameworks'.

fix Qt OS macro

M  +1    -1    app/album/albumwatch.cpp
M  +2    -2    libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp
M  +2    -2    libs/dimg/filters/icc/iccprofile.cpp
M  +5    -5    libs/dimg/filters/icc/iccsettings.cpp
M  +2    -2    libs/widgets/itemview/itemviewtooltip.cpp
M  +0    -1    utilities/importui/dialogs/cameramessagebox.h
M  +2    -2    utilities/setup/setupicc.cpp

http://commits.kde.org/digikam/8009b8dabdf8e99f051b09a6ee30f577f3a078a4

diff --git a/app/album/albumwatch.cpp b/app/album/albumwatch.cpp
index 2dd9fbb..4ca17fa 100644
--- a/app/album/albumwatch.cpp
+++ b/app/album/albumwatch.cpp
@@ -278,7 +278,7 @@ void AlbumWatch::slotAlbumAdded(Album* a)
             // Disable file watch for OS X and Windows and hope for future
             // improvement (possibly with the improvements planned for
             // QFileSystemWatcher in Qt 5.1)
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
             d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly);
 #else
             d->dirWatch->addDir(dir, KDirWatch::WatchFiles | \
                KDirWatch::WatchDirOnly);
diff --git a/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp \
b/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp index b9f540d..df958c9 100644
--- a/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp
+++ b/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp
@@ -241,7 +241,7 @@ int get_mem_stats(Digikam::KMemoryInfo::KMemoryInfoData* const \
data)  MEMORYSTATUSEX memstats;
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     Q_UNUSED(data);
 #endif
 
@@ -557,7 +557,7 @@ int get_mem_stats(Digikam::KMemoryInfo::KMemoryInfoData* const \
data)  int get_swap_stats(Digikam::KMemoryInfo::KMemoryInfoData* const data)
 {
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     Q_UNUSED(data);
 #endif
     
diff --git a/libs/dimg/filters/icc/iccprofile.cpp \
b/libs/dimg/filters/icc/iccprofile.cpp index 064e2ca..b14de84 100644
--- a/libs/dimg/filters/icc/iccprofile.cpp
+++ b/libs/dimg/filters/icc/iccprofile.cpp
@@ -488,12 +488,12 @@ QStringList IccProfile::defaultSearchPaths()
 
     paths << KGlobal::dirs()->findDirs("data", "color/icc");
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 
     candidates << QDir::rootPath() + "/Windows/Spool/Drivers/Color/";   // For Win2K \
                and WinXP
     candidates << QDir::rootPath() + "/Windows/Color/";                 // For Win98 \
and WinMe  
-#elif defined (Q_WS_MAC)
+#elif defined (Q_OS_MAC)
 
     // Use a scheme highly identical to the Linux scheme, adapted for MacPorts in \
/opt/local and the OS X standard ColorSync directories  
diff --git a/libs/dimg/filters/icc/iccsettings.cpp \
b/libs/dimg/filters/icc/iccsettings.cpp index 2cfaed6..18ace85 100644
--- a/libs/dimg/filters/icc/iccsettings.cpp
+++ b/libs/dimg/filters/icc/iccsettings.cpp
@@ -27,13 +27,13 @@
 
 // X11 includes
 
-#ifdef Q_WS_X11
+#ifdef HAVE_X11
 #   include <climits>
 #   include <X11/Xlib.h>
 #   include <X11/Xatom.h>
 #   include <fixx11h.h>
 #   include <QX11Info>
-#endif /* Q_WS_X11 */
+#endif /* HAVE_X11 */
 
 // Qt includes
 
@@ -190,7 +190,7 @@ bool IccSettings::monitorProfileFromSystem() const
 */
 IccProfile IccSettings::Private::profileFromWindowSystem(QWidget* const widget)
 {
-#ifdef Q_WS_X11
+#ifdef HAVE_X11
 
     Qt::HANDLE appRootWindow;
     QString    atomName;
@@ -273,10 +273,10 @@ IccProfile \
IccSettings::Private::profileFromWindowSystem(QWidget* const widget)  \
screenProfiles.insert(screenNumber, profile);  }
 
-#elif defined Q_WS_WIN
+#elif defined Q_OS_WIN
     //TODO
     Q_UNUSED(widget);
-#elif defined Q_WS_MAC
+#elif defined Q_OS_MAC
     //TODO
     Q_UNUSED(widget);
 #endif
diff --git a/libs/widgets/itemview/itemviewtooltip.cpp \
b/libs/widgets/itemview/itemviewtooltip.cpp index 584fded..c347896 100644
--- a/libs/widgets/itemview/itemviewtooltip.cpp
+++ b/libs/widgets/itemview/itemviewtooltip.cpp
@@ -137,7 +137,7 @@ bool ItemViewToolTip::eventFilter(QObject* o, QEvent* e)
     switch (e->type())
     {
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
         case QEvent::KeyPress:
         case QEvent::KeyRelease:
         {
@@ -155,7 +155,7 @@ bool ItemViewToolTip::eventFilter(QObject* o, QEvent* e)
 
             break;
         }
-#endif // Q_WS_MAC
+#endif // Q_OS_MAC
 
         case QEvent::Leave:
             hide(); // could add a 300ms timer here, like Qt
diff --git a/utilities/importui/dialogs/cameramessagebox.h \
b/utilities/importui/dialogs/cameramessagebox.h index cec7f0f..57aec48 100644
--- a/utilities/importui/dialogs/cameramessagebox.h
+++ b/utilities/importui/dialogs/cameramessagebox.h
@@ -32,7 +32,6 @@
 // KDE includes
 
 #include <kdialog.h>
-//#include <kmessagebox.h>
 #include <kstandardguiitem.h>
 
 // Local includes
diff --git a/utilities/setup/setupicc.cpp b/utilities/setup/setupicc.cpp
index d33e05c..b606036 100644
--- a/utilities/setup/setupicc.cpp
+++ b/utilities/setup/setupicc.cpp
@@ -896,7 +896,7 @@ void SetupICC::slotShowDefaultSearchPaths()
         existingPaths = defaultSearchPaths.join("</li><li>");
     }
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 
     QString text = i18n("On Windows, the default search paths include "
                         "<ul>"
@@ -911,7 +911,7 @@ void SetupICC::slotShowDefaultSearchPaths()
                         QDir::rootPath(),
                         existingPaths);
 
-#elif defined (Q_WS_MAC)
+#elif defined (Q_OS_MAC)
     QString text = i18n("On Mac OS X, the default search paths include "
                         "<ul>"
                         "<li>/System/Library/ColorSync/Profiles</li>"


[prev in list] [next in list] [prev in thread] [next in thread]