LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File gcc45.diff of Package kde3-kile (Project KDE:KDE3)

--- src/kile/kiledocumentinfo.cpp	2008-11-16 15:20:36.000000000 +0100
+++ src/kile/kiledocumentinfo.cpp	2010-04-19 13:59:19.382784392 +0200
@@ -601,7 +601,7 @@
 
 QString TextInfo::getTextline(uint line, TodoResult &todo)
 {
-	static QRegExp::QRegExp reComments("[^\\\\](%.*$)");
+	static QRegExp reComments("[^\\\\](%.*$)");
 
 	todo.type = -1;
 	QString s = m_doc->textLine(line);
@@ -632,7 +632,7 @@
 
 void TextInfo::searchTodoComment(const QString &s, uint startpos, TodoResult &todo)
 {
-	static QRegExp::QRegExp reTodoComment("\\b(TODO|FIXME)\\b(:|\\s)?\\s*(.*)");
+	static QRegExp reTodoComment("\\b(TODO|FIXME)\\b(:|\\s)?\\s*(.*)");
 
 	if ( s.find(reTodoComment,startpos) != -1 )
 	{
@@ -863,12 +863,12 @@
 	Info::updateStruct();
 
 	QMapConstIterator<QString,KileStructData> it;
-	static QRegExp::QRegExp reCommand("(\\\\[a-zA-Z]+)\\s*\\*?\\s*(\\{|\\[)");
-	static QRegExp::QRegExp reRoot("\\\\documentclass|\\\\documentstyle");
-	static QRegExp::QRegExp reBD("\\\\begin\\s*\\{\\s*document\\s*\\}");
-	static QRegExp::QRegExp reReNewCommand("\\\\renewcommand.*$");
-	static QRegExp::QRegExp reNumOfParams("\\s*\\[([1-9]+)\\]");
-	static QRegExp::QRegExp reNumOfOptParams("\\s*\\[([1-9]+)\\]\\s*\\[([^\\{]*)\\]"); // the quantifier * isn't used by mistake, because also emtpy optional brackets are correct.
+	static QRegExp reCommand("(\\\\[a-zA-Z]+)\\s*\\*?\\s*(\\{|\\[)");
+	static QRegExp reRoot("\\\\documentclass|\\\\documentstyle");
+	static QRegExp reBD("\\\\begin\\s*\\{\\s*document\\s*\\}");
+	static QRegExp reReNewCommand("\\\\renewcommand.*$");
+	static QRegExp reNumOfParams("\\s*\\[([1-9]+)\\]");
+	static QRegExp reNumOfOptParams("\\s*\\[([1-9]+)\\]\\s*\\[([^\\{]*)\\]"); // the quantifier * isn't used by mistake, because also emtpy optional brackets are correct.
 
 	int teller=0, tagStart, bd = 0;
 	uint tagEnd, tagLine = 0, tagCol = 0;
@@ -1216,8 +1216,8 @@
 
 	KILE_DEBUG() << "==void BibInfo::updateStruct()========" << endl;
 
-	static QRegExp::QRegExp reItem("^(\\s*)@([a-zA-Z]+)");
-	static QRegExp::QRegExp reSpecial("string|preamble|comment");
+	static QRegExp reItem("^(\\s*)@([a-zA-Z]+)");
+	static QRegExp reSpecial("string|preamble|comment");
 
 	QString s, key;
 	int col = 0, startcol, startline = 0;
--- src/kile/latexoutputfilter.cpp	2008-11-27 12:32:59.000000000 +0100
+++ src/kile/latexoutputfilter.cpp	2010-04-19 14:04:02.247815033 +0200
@@ -55,7 +55,7 @@
 
 bool LatexOutputFilter::fileExists(const QString & name)
 {
-	static QFileInfo::QFileInfo fi;
+	static QFileInfo fi;
 
 	if (name[0] == '/' )
 	{
@@ -101,7 +101,7 @@
 {
 	//KILE_DEBUG() << "==LatexOutputFilter::updateFileStack()================" << endl;
 
-	static QString::QString strPartialFileName;
+	static QString strPartialFileName;
 
 	switch (dwCookie)
 	{
@@ -172,7 +172,7 @@
 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 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 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 @@
 {
 	//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 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 @@
 {
 	//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)
 	{
--- src/kile/kilestructurewidget.cpp	2008-06-08 13:34:46.000000000 +0200
+++ src/kile/kilestructurewidget.cpp	2010-04-19 14:04:49.274821318 +0200
@@ -648,7 +648,7 @@
 	{
 		KILE_DEBUG() << "\tStructure::slotDoubleClicked" << endl;
 		KileListViewItem *item = (KileListViewItem*)(itm);
-		static QRegExp::QRegExp suffix("\\.[\\d\\w]*$");
+		static QRegExp suffix("\\.[\\d\\w]*$");
 		
 		if (!item)
 			return;
--- src/kile/codecompletion.cpp	2008-11-21 00:09:28.000000000 +0100
+++ src/kile/codecompletion.cpp	2010-04-19 14:06:23.062030142 +0200
@@ -38,12 +38,12 @@
 namespace KileDocument
 {
 
-	static QRegExp::QRegExp reRef;
-	static QRegExp::QRegExp reRefExt;
-	static QRegExp::QRegExp reCite;
-	static QRegExp::QRegExp reCiteExt;
-	static QRegExp::QRegExp reNotRefChars("[^a-zA-Z0-9_@\\.\\+\\-\\*\\:]");
-	static QRegExp::QRegExp reNotCiteChars("[^a-zA-Z0-9_@\\-\\:]");
+	static QRegExp reRef;
+	static QRegExp reRefExt;
+	static QRegExp reCite;
+	static QRegExp reCiteExt;
+	static QRegExp reNotRefChars("[^a-zA-Z0-9_@\\.\\+\\-\\*\\:]");
+	static QRegExp reNotCiteChars("[^a-zA-Z0-9_@\\-\\:]");
 
 	CodeCompletion::CodeCompletion(KileInfo *info) : m_ki(info), m_view(0L)
 	{
@@ -532,7 +532,7 @@
 
 	QString CodeCompletion::filterCompletionText( const QString &text, const QString &type )
 	{
-		static QRegExp::QRegExp reEnv = QRegExp("^\\\\(begin|end)[^a-zA-Z]+");
+		static QRegExp reEnv = QRegExp("^\\\\(begin|end)[^a-zA-Z]+");
 		KILE_DEBUG() << "   complete filter: " << text << " type " << type << endl;
 		m_type = getType( text );    // remember current type
 
@@ -631,7 +631,7 @@
 	QString CodeCompletion::buildEnvironmentText( const QString &text, const QString &type,
 	                                              const QString &prefix, uint &ypos, uint &xpos )
 	{
-		static QRegExp::QRegExp reEnv = QRegExp("^\\\\(begin|end)\\{([^\\}]*)\\}(.*)");
+		static QRegExp reEnv = QRegExp("^\\\\(begin|end)\\{([^\\}]*)\\}(.*)");
 
 		if (reEnv.search(text) == -1) return text;