head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.1.0.8
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.6
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.4
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.2
	pkgsrc-2011Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.03.21.22.59.42;	author markd;	state dead;
branches;
next	1.1;

1.1
date	2011.01.29.22.23.36;	author markd;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 2.1.1

KDE4 version.
@
text
@$NetBSD: patch-ac,v 1.1 2011/01/29 22:23:36 markd Exp $

fix build with gcc4.5

--- src/kile/latexoutputfilter.cpp.orig	2008-08-25 21:10:45.000000000 +0000
+++ src/kile/latexoutputfilter.cpp
@@@@ -55,7 +55,7 @@@@ bool LatexOutputFilter::OnPreCreate()
 
 bool LatexOutputFilter::fileExists(const QString & name)
 {
-	static QFileInfo::QFileInfo fi;
+	static QFileInfo fi;
 
 	if (name[0] == '/' )
 	{
@@@@ -101,7 +101,7 @@@@ void LatexOutputFilter::updateFileStack(
 {
 	//KILE_DEBUG() << "==LatexOutputFilter::updateFileStack()================" << endl;
 
-	static QString::QString strPartialFileName;
+	static QString strPartialFileName;
 
 	switch (dwCookie)
 	{
@@@@ -172,7 +172,7 @@@@ void LatexOutputFilter::updateFileStack(
 void LatexOutputFilter::updateFileStackHeuristic(const QString &strLine, short & dwCookie)
 {
 	//KILE_DEBUG() << "==LatexOutputFilter::updateFileStackHeuristic()================" << endl;
-	static QString::QString strPartialFileName;
+	static QString strPartialFileName;
 	bool expectFileName = (dwCookie == FileNameHeuristic);
 	int index = 0;
 
@@@@ -282,10 +282,10 @@@@ bool LatexOutputFilter::detectError(cons
 
 	bool found = false, flush = false;
 
-	static QRegExp::QRegExp reLaTeXError("^! LaTeX Error: (.*)$", false);
-	static QRegExp::QRegExp rePDFLaTeXError("^Error: pdflatex (.*)$", false);
-	static QRegExp::QRegExp reTeXError("^! (.*)");
-	static QRegExp::QRegExp reLineNumber("^l\\.([0-9]+)(.*)");
+	static QRegExp reLaTeXError("^! LaTeX Error: (.*)$", false);
+	static QRegExp rePDFLaTeXError("^Error: pdflatex (.*)$", false);
+	static QRegExp reTeXError("^! (.*)");
+	static QRegExp reLineNumber("^l\\.([0-9]+)(.*)");
 
 	switch (dwCookie)
 	{
@@@@ -370,9 +370,9 @@@@ bool LatexOutputFilter::detectWarning(co
 	bool found = false, flush = false;
 	QString warning;
 
-	static QRegExp::QRegExp reLaTeXWarning("^(((! )?(La|pdf)TeX)|Package|Class) .*Warning.*:(.*)", false);
-	static QRegExp::QRegExp reNoFile("No file (.*)");
-	static QRegExp::QRegExp reNoAsyFile("File .* does not exist."); // FIXME can be removed when http://sourceforge.net/tracker/index.php?func=detail&aid=1772022&group_id=120000&atid=685683 has promoted to the users
+	static QRegExp reLaTeXWarning("^(((! )?(La|pdf)TeX)|Package|Class) .*Warning.*:(.*)", false);
+	static QRegExp reNoFile("No file (.*)");
+	static QRegExp reNoAsyFile("File .* does not exist."); // FIXME can be removed when http://sourceforge.net/tracker/index.php?func=detail&aid=1772022&group_id=120000&atid=685683 has promoted to the users
 
 	switch (dwCookie)
 	{
@@@@ -437,8 +437,8 @@@@ bool LatexOutputFilter::detectLaTeXLineN
 {
 	//KILE_DEBUG() << "==LatexOutputFilter::detectLaTeXLineNumber(" << warning.length() << ")================" << endl;
 
-	static QRegExp::QRegExp reLaTeXLineNumber("(.*) on input line ([0-9]+)\\.$", false);
-	static QRegExp::QRegExp reInternationalLaTeXLineNumber("(.*)([0-9]+)\\.$", false);
+	static QRegExp reLaTeXLineNumber("(.*) on input line ([0-9]+)\\.$", false);
+	static QRegExp reInternationalLaTeXLineNumber("(.*)([0-9]+)\\.$", false);
 	if ( (reLaTeXLineNumber.search(warning) != -1) || (reInternationalLaTeXLineNumber.search(warning) != -1) )
 	{
 		//KILE_DEBUG() << "een" << endl;
@@@@ -478,7 +478,7 @@@@ bool LatexOutputFilter::detectBadBox(con
 	bool found = false, flush = false;
 	QString badbox;
 
-	static QRegExp::QRegExp reBadBox("^(Over|Under)(full \\\\[hv]box .*)", false);
+	static QRegExp reBadBox("^(Over|Under)(full \\\\[hv]box .*)", false);
 
 	switch (dwCookie)
 	{
@@@@ -517,11 +517,11 @@@@ bool LatexOutputFilter::detectBadBoxLine
 {
 	//KILE_DEBUG() << "==LatexOutputFilter::detectBadBoxLineNumber(" << strLine.length() << ")================" << endl;
 
-	static QRegExp::QRegExp reBadBoxLines("(.*) at lines ([0-9]+)--([0-9]+)", false);
-	static QRegExp::QRegExp reBadBoxLine("(.*) at line ([0-9]+)", false);
+	static QRegExp reBadBoxLines("(.*) at lines ([0-9]+)--([0-9]+)", false);
+	static QRegExp reBadBoxLine("(.*) at line ([0-9]+)", false);
 	//Use the following only, if you know how to get the source line for it.
 	// This is not simple, as TeX is not reporting it.
-	static QRegExp::QRegExp reBadBoxOutput("(.*)has occurred while \\output is active^", false);
+	static QRegExp reBadBoxOutput("(.*)has occurred while \\output is active^", false);
 
 	if ( reBadBoxLines.search(strLine) != -1)
 	{
@


1.1
log
@Fix build with gcc4.5
@
text
@d1 1
a1 1
$NetBSD$
@