# HG changeset patch
# User insilmaril
# Date 1194610041 0
# Node ID 4ffc47ae27e428a05eb4d0c523820d9ecaa015fd
# Parent  7ba1c04d96d5a83f3593f03ae612ad3f47eac291
1.11.3 Better windows support

diff -r 7ba1c04d96d5 -r 4ffc47ae27e4 exportxhtmldialog.cpp
--- a/exportxhtmldialog.cpp	Fri Nov 09 12:07:20 2007 +0000
+++ b/exportxhtmldialog.cpp	Fri Nov 09 12:07:21 2007 +0000
@@ -85,16 +85,18 @@
 	ui.outputButton->setChecked(showOutput);
 
 	// For testing better use local styles
+    const QString defxsl(vymBaseDir.path() + "/styles/vym2xhtml.xsl");
+    const QString defcss(vymBaseDir.path() + "/styles/vym.css");
 	if (options.isOn ("local"))
 	{
-		xsl=vymBaseDir.path()+"/styles/vym2xhtml.xsl";
-		css=vymBaseDir.path()+"/styles/vym.css";
+		xsl=defxsl;
+		css=defcss;
 	} else
 	{
 		xsl=settings.readLocalEntry 
-			(filepath,"/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl");
+			(filepath,"/export/xhtml/xsl",defxsl);
 		css=settings.readLocalEntry 
-			(filepath,"/export/xhtml/css","/usr/share/vym/styles/vym.css");	
+			(filepath,"/export/xhtml/css",defcss);	
 	}
 	ui.lineEditXSL->setText(xsl);
 	ui.lineEditCSS->setText(css);
diff -r 7ba1c04d96d5 -r 4ffc47ae27e4 file.cpp
--- a/file.cpp	Fri Nov 09 12:07:20 2007 +0000
+++ b/file.cpp	Fri Nov 09 12:07:21 2007 +0000
@@ -8,9 +8,8 @@
 #include "file.h"
 #include "process.h"
 
-// Avoid full inclusion of io.h by just defining mktemp's prototype here.
 #if defined(Q_OS_WIN32)
-extern "C" char *_mktemp(char *fmt);
+#include "mkdtemp.h"
 #include <windows.h>
 #endif
 
@@ -150,12 +149,7 @@
 		p[i]=s.at(i).latin1();
 	p[bytes]=0;	
 
-#if defined(Q_OS_WIN32)
-    // There's no mkdtemp on VCEE.
-    QString r=_mktemp(p);
-#else
 	QString r=mkdtemp (p);
-#endif
 	if (r.isEmpty()) ok=false;
 	free (p);
 	return r;