From kde-commits  Mon Dec 13 14:26:54 2010
From: Patrick von Reth <patrick.vonreth () gmail ! com>
Date: Mon, 13 Dec 2010 14:26:54 +0000
To: kde-commits
Subject: KDE/kdelibs/kdecore
Message-Id: <20101213142654.A23C3AC8A7 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129225049002716

SVN commit 1206137 by vonreth:

compile fixes for mingw

 M  +1 -1      localization/kcatalog.cpp  
 M  +1 -1      util/kde_file_win.cpp  


--- trunk/KDE/kdelibs/kdecore/localization/kcatalog.cpp #1206136:1206137
@@ -169,7 +169,7 @@
   return QFile::decodeName(d->localeDir);
 }
 
-#ifdef _MSC_VER
+#ifdef Q_WS_WIN
   extern "C" int __declspec(dllimport) _nl_msg_cat_cntr;
 #endif
 
--- trunk/KDE/kdelibs/kdecore/util/kde_file_win.cpp #1206136:1206137
@@ -83,7 +83,7 @@
   int value;
 
   if ( !_template.endsWith(QLatin1String("XXXXXX")) )
-      return 0;
+      return QString();
 
   strcpy(XXXXXX, "XXXXXX");
   const QString tmpl = _template.left(_template.length() - 6);