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

List:       kde-commits
Subject:    extragear/graphics/digikam/libs
From:       Carlo Segato <brandon.ml () gmail ! com>
Date:       2009-09-25 9:27:16
Message-ID: 1253870836.404840.9041.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1027976 by segato:

the correct way is to check for UNICODE, even if we always use UNICODE with kde so \
this ifdef may be removed

 M  +4 -4      dimg/loaders/pgfloader.cpp  
 M  +2 -2      threadimageio/pgfutils.cpp  


--- trunk/extragear/graphics/digikam/libs/dimg/loaders/pgfloader.cpp #1027975:1027976
@@ -132,9 +132,9 @@
     // Initialize PGF API.
 
 #ifdef WIN32
-#ifdef Q_CC_MSVC
+#ifdef UNICODE
     HANDLE fd = CreateFile((LPCWSTR)(QFile::encodeName(filePath).constData()), \
                GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
-#else /* MinGW compiler. */
+#else
     HANDLE fd = CreateFile(QFile::encodeName(filePath), GENERIC_READ, 0, 0, \
OPEN_EXISTING, 0, 0);  #endif
     if (fd == INVALID_HANDLE_VALUE)
@@ -313,9 +313,9 @@
     m_observer = observer;
 
 #ifdef WIN32
-#ifdef Q_CC_MSVC
+#ifdef UNICODE
     HANDLE fd = CreateFile((LPCWSTR)(QFile::encodeName(filePath).constData()), \
                GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
-#else /* MinGW compiler. */
+#else
     HANDLE fd = CreateFile(QFile::encodeName(filePath), GENERIC_READ, 0, 0, \
OPEN_EXISTING, 0, 0);  #endif
     if (fd == INVALID_HANDLE_VALUE)
--- trunk/extragear/graphics/digikam/libs/threadimageio/pgfutils.cpp #1027975:1027976
@@ -158,9 +158,9 @@
     // Initialize PGF API.
 
 #ifdef WIN32
-#ifdef Q_CC_MSVC
+#ifdef UNICODE
     HANDLE fd = CreateFile((LPCWSTR)(QFile::encodeName(path).constData()), \
                GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
-#else /* MinGW compiler. */
+#else
     HANDLE fd = CreateFile(QFile::encodeName(path), GENERIC_READ, 0, 0, \
OPEN_EXISTING, 0, 0);  #endif
 	if (fd == INVALID_HANDLE_VALUE)


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