diff -r 2827ca924b18 -r 142e0f1e61d5 exportxhtmldialog.ui.h
--- a/exportxhtmldialog.ui.h	Mon Apr 24 11:31:15 2006 +0000
+++ b/exportxhtmldialog.ui.h	Thu Sep 14 11:38:17 2006 +0000
@@ -1,3 +1,6 @@
+//Added by qt3to4:
+#include <QPixmap>
+#include <QTextStream>
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
@@ -22,42 +25,42 @@
 void ExportXHTMLDialog::readSettings()
 {
 
-	dir=settings.readLocalEntry (filepath,"/vym/export/xhtml/exportDir",vymBaseDir.currentDirPath() );
+	dir=settings.readLocalEntry (filepath,"/export/xhtml/exportDir",vymBaseDir.currentDirPath() );
 	lineEditDir->setText(dir);
 	
-    if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/useImage","yes")=="yes")
+    if ( settings.readLocalEntry (filepath,"/export/xhtml/useImage","yes")=="yes")
 		useImage=true;
 	else	
 		useImage=false;
 	imageButton->setChecked(useImage);
 		
-	if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/useTextColor","no")=="yes")
+	if ( settings.readLocalEntry (filepath,"/export/xhtml/useTextColor","no")=="yes")
 		useTextColor=true;
 	else	
 		useTextColor=false;
 	textColorButton->setChecked(useTextColor);
 	
 /* FIXME this was used in old html export, is not yet in new stylesheet
-	if ( settings.readEntry ("/vym/export/html/useHeading","no")=="yes")
+	if ( settings.readEntry ("/export/html/useHeading","no")=="yes")
 		useHeading=true;
 	else	
 		useHeading=false;
 	checkBox4_2->setChecked(useHeading);
 */		
 
-	if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/saveSettingsInMap","no")=="yes")
+	if ( settings.readLocalEntry (filepath,"/export/xhtml/saveSettingsInMap","no")=="yes")
 		saveSettingsInMap=true;
 	else	
 		saveSettingsInMap=false;
 	saveSettingsInMapButton->setChecked(saveSettingsInMap);
 
-	if ( settings.readEntry ("/vym/export/xhtml/showWarnings","yes")=="yes")
+	if ( settings.readEntry ("/export/xhtml/showWarnings","yes")=="yes")
 		showWarnings=true;
 	else	
 		showWarnings=false;
 	warningsButton->setChecked(showWarnings);
 	
-	if ( settings.readEntry ("/vym/export/xhtml/showOutput","no")=="yes")
+	if ( settings.readEntry ("/export/xhtml/showOutput","no")=="yes")
 		showOutput=true;
 	else	
 		showOutput=false;
@@ -71,19 +74,19 @@
 	} else
 	{
 		xsl=settings.readLocalEntry 
-			(filepath,"/vym/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl");
+			(filepath,"/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl");
 		css=settings.readLocalEntry 
-			(filepath,"/vym/export/xhtml/css","/usr/share/vym/styles/vym.css");	
+			(filepath,"/export/xhtml/css","/usr/share/vym/styles/vym.css");	
 	}
 	lineEditXSL->setText(xsl);
 	lineEditCSS->setText(css);
 	
 	prescript=settings.readLocalEntry
-		(filepath,"/vym/export/xhtml/prescript","");
+		(filepath,"/export/xhtml/prescript","");
 	lineEditPreScript->setText (prescript);	
 	
 	postscript=settings.readLocalEntry
-		(filepath,"/vym/export/xhtml/postscript","");
+		(filepath,"/export/xhtml/postscript","");
 	lineEditPostScript->setText (postscript);	
 
 	if (!prescript.isEmpty() || !postscript.isEmpty())
@@ -112,8 +115,8 @@
 
 void ExportXHTMLDialog::browseDirectoryPressed()
 {
-   	QFileDialog fd( this, tr("VYM - Export HTML to directory"));
-	fd.setMode (QFileDialog::DirectoryOnly);
+   	Q3FileDialog fd( this, tr("VYM - Export HTML to directory"));
+	fd.setMode (Q3FileDialog::DirectoryOnly);
 	fd.setCaption(tr("VYM - Export HTML to directory"));
 	fd.setModal (true);
 	fd.show();
@@ -165,7 +168,7 @@
 
 void ExportXHTMLDialog::browseCSSPressed()
 {
-   	QFileDialog fd( this, tr("VYM - Path to CSS file"));
+   	Q3FileDialog fd( this, tr("VYM - Path to CSS file"));
 	fd.setModal (true);
 	fd.addFilter ("Cascading Stylesheet (*.css)");
 	fd.show();
@@ -192,7 +195,7 @@
 
 void ExportXHTMLDialog::browseXSLPressed()
 {
-   	QFileDialog fd( this, tr("VYM - Path to XSL file"));
+   	Q3FileDialog fd( this, tr("VYM - Path to XSL file"));
 	fd.setModal (true);
 	fd.addFilter ("Extensible Stylesheet Language (*.xsl)");
 	fd.show();
@@ -213,7 +216,7 @@
 
 void ExportXHTMLDialog::browsePreExportButtonPressed()
 {
-	QFileDialog fd( this, tr("VYM - Path to pre export script"));
+	Q3FileDialog fd( this, tr("VYM - Path to pre export script"));
 	fd.setModal (true);
 	fd.addFilter ("Scripts (*.sh *.pl *.py *.php)");
 	fd.show();
@@ -229,7 +232,7 @@
 
 void ExportXHTMLDialog::browsePostExportButtonPressed()
 {
-	QFileDialog fd( this, tr("VYM - Path to post export script"));
+	Q3FileDialog fd( this, tr("VYM - Path to post export script"));
 	fd.setModal (true);
 	fd.addFilter ("Scripts (*.sh *.pl *.py *.php)");
 	fd.show();
@@ -248,38 +251,38 @@
 	// Save options to settings file 
 	// (but don't save at destructor, which
 	// is called for "cancel", too)
-	settings.setLocalEntry (filepath,"/vym/export/xhtml/exportDir",dir);
-	settings.setLocalEntry (filepath,"/vym/export/xhtml/prescript",prescript);
-	settings.setLocalEntry (filepath,"/vym/export/xhtml/postscript",postscript);
+	settings.setLocalEntry (filepath,"/export/xhtml/exportDir",dir);
+	settings.setLocalEntry (filepath,"/export/xhtml/prescript",prescript);
+	settings.setLocalEntry (filepath,"/export/xhtml/postscript",postscript);
 
     if (useImage)
-		settings.setLocalEntry (filepath,"/vym/export/xhtml/useImage","yes");
+		settings.setLocalEntry (filepath,"/export/xhtml/useImage","yes");
     else
-		settings.setLocalEntry (filepath,"/vym/export/xhtml/useImage","no");	
+		settings.setLocalEntry (filepath,"/export/xhtml/useImage","no");	
 	
   if (useTextColor)
-		settings.setLocalEntry (filepath,"/vym/export/xhtml/useTextColor","yes");
+		settings.setLocalEntry (filepath,"/export/xhtml/useTextColor","yes");
     else
-		settings.setLocalEntry (filepath,"/vym/export/xhtml/useTextColor","no");	
+		settings.setLocalEntry (filepath,"/export/xhtml/useTextColor","no");	
 	
    if (showWarnings)
-		settings.writeEntry ("/vym/export/xhtml/showWarnings","yes");
+		settings.writeEntry ("/export/xhtml/showWarnings","yes");
     else
-		settings.writeEntry ("/vym/export/xhtml/showWarnings","no");	
+		settings.writeEntry ("/export/xhtml/showWarnings","no");	
 			
 	if (showOutput)
-		settings.writeEntry ("/vym/export/xhtml/showOutput","yes");
+		settings.writeEntry ("/export/xhtml/showOutput","yes");
 	else
-		settings.writeEntry ("/vym/export/xhtml/showOutput","no");	
+		settings.writeEntry ("/export/xhtml/showOutput","no");	
 
 	QString ipath;	
 	ipath=vymBaseDir.path()+"/flags/flag-url-16x16.png";
 	if (!options.isOn ("local"))
 	{
 		settings.setLocalEntry 
-			(filepath,"/vym/export/xhtml/xsl",xsl);
+			(filepath,"/export/xhtml/xsl",xsl);
 		settings.setLocalEntry 
-			(filepath,"/vym/export/xhtml/css",css);	
+			(filepath,"/export/xhtml/css",css);	
 	}
 
 	// Provide a smaller URL-icon to improve Layout
@@ -291,19 +294,19 @@
 	if(!pm.save (dir + "flags/flag-url-16x16.png","PNG"))
 		QMessageBox::warning( 0, tr( "Warning" ),tr("Could not write %1").arg(ipath));
 	if (!saveSettingsInMap)
-		settings.clearLocal("/vym/export/xhtml");
+		settings.clearLocal("/export/xhtml");
 	else	
 		settings.setLocalEntry 
-			(filepath,"/vym/export/xhtml/saveSettingsInMap","yes");
+			(filepath,"/export/xhtml/saveSettingsInMap","yes");
 
 	// Copy CSS file
 	QFile css_src (css);
 	QFile css_dst (dir+"vym.css");
-	if (!css_src.open ( IO_ReadOnly))
-		QMessageBox::warning( 0, tr( "Warning" ),+tr("Could not open %1").arg(css));
+	if (!css_src.open ( QIODevice::ReadOnly))
+		QMessageBox::warning( 0, tr( "Warning" ),tr("Could not open %1").arg(css));
 	else
 	{
-		if (!css_dst.open( IO_WriteOnly))
+		if (!css_dst.open( QIODevice::WriteOnly))
 			QMessageBox::warning( 0, tr( "Warning" ), tr("Could not open %1").arg(dir+"vym.css"));
 		else
 		{