summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-30 22:57:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-30 22:57:07 +0000
commitb9ce99f4e5f244800fb4f5f10c15799fa02a80a2 (patch)
treee13fdcaa3824b44cb4bb61a699032d1896638af1
parente07d088d7bd464a590ab597965174ff3140b61a1 (diff)
downloadkile-b9ce99f4e5f244800fb4f5f10c15799fa02a80a2.tar.gz
kile-b9ce99f4e5f244800fb4f5f10c15799fa02a80a2.zip
Fix additional kile FTBFS under gcc4.6
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kile@1244137 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/kile/codecompletion.cpp16
-rw-r--r--src/kile/kilestructurewidget.cpp2
-rw-r--r--src/kile/latexoutputfilter.cpp32
3 files changed, 25 insertions, 25 deletions
diff --git a/src/kile/codecompletion.cpp b/src/kile/codecompletion.cpp
index a738dca..9cdc703 100644
--- a/src/kile/codecompletion.cpp
+++ b/src/kile/codecompletion.cpp
@@ -38,12 +38,12 @@
namespace KileDocument
{
- static TQRegExp::TQRegExp reRef;
- static TQRegExp::TQRegExp reRefExt;
- static TQRegExp::TQRegExp reCite;
- static TQRegExp::TQRegExp reCiteExt;
- static TQRegExp::TQRegExp reNotRefChars("[^a-zA-Z0-9_@\\.\\+\\-\\*\\:]");
- static TQRegExp::TQRegExp reNotCiteChars("[^a-zA-Z0-9_@\\-\\:]");
+ static TQRegExp reRef;
+ static TQRegExp reRefExt;
+ static TQRegExp reCite;
+ static TQRegExp reCiteExt;
+ static TQRegExp reNotRefChars("[^a-zA-Z0-9_@\\.\\+\\-\\*\\:]");
+ static TQRegExp reNotCiteChars("[^a-zA-Z0-9_@\\-\\:]");
CodeCompletion::CodeCompletion(KileInfo *info) : m_ki(info), m_view(0L)
{
@@ -532,7 +532,7 @@ namespace KileDocument
TQString CodeCompletion::filterCompletionText( const TQString &text, const TQString &type )
{
- static TQRegExp::TQRegExp reEnv = TQRegExp("^\\\\(begin|end)[^a-zA-Z]+");
+ static TQRegExp reEnv = TQRegExp("^\\\\(begin|end)[^a-zA-Z]+");
KILE_DEBUG() << " complete filter: " << text << " type " << type << endl;
m_type = getType( text ); // remember current type
@@ -631,7 +631,7 @@ namespace KileDocument
TQString CodeCompletion::buildEnvironmentText( const TQString &text, const TQString &type,
const TQString &prefix, uint &ypos, uint &xpos )
{
- static TQRegExp::TQRegExp reEnv = TQRegExp("^\\\\(begin|end)\\{([^\\}]*)\\}(.*)");
+ static TQRegExp reEnv = TQRegExp("^\\\\(begin|end)\\{([^\\}]*)\\}(.*)");
if (reEnv.search(text) == -1) return text;
diff --git a/src/kile/kilestructurewidget.cpp b/src/kile/kilestructurewidget.cpp
index 72349ff..b95375a 100644
--- a/src/kile/kilestructurewidget.cpp
+++ b/src/kile/kilestructurewidget.cpp
@@ -648,7 +648,7 @@ namespace KileWidget
{
KILE_DEBUG() << "\tStructure::slotDoubleClicked" << endl;
KileListViewItem *item = (KileListViewItem*)(itm);
- static TQRegExp::TQRegExp suffix("\\.[\\d\\w]*$");
+ static TQRegExp suffix("\\.[\\d\\w]*$");
if (!item)
return;
diff --git a/src/kile/latexoutputfilter.cpp b/src/kile/latexoutputfilter.cpp
index 9c24d2d..accbfa0 100644
--- a/src/kile/latexoutputfilter.cpp
+++ b/src/kile/latexoutputfilter.cpp
@@ -55,7 +55,7 @@ bool LatexOutputFilter::OnPreCreate()
bool LatexOutputFilter::fileExists(const TQString & name)
{
- static TQFileInfo::TQFileInfo fi;
+ static TQFileInfo fi;
if (name[0] == '/' )
{
@@ -101,7 +101,7 @@ void LatexOutputFilter::updateFileStack(const TQString &strLine, short & dwCooki
{
//KILE_DEBUG() << "==LatexOutputFilter::updateFileStack()================" << endl;
- static TQString::TQString strPartialFileName;
+ static TQString strPartialFileName;
switch (dwCookie)
{
@@ -172,7 +172,7 @@ void LatexOutputFilter::updateFileStack(const TQString &strLine, short & dwCooki
void LatexOutputFilter::updateFileStackHeuristic(const TQString &strLine, short & dwCookie)
{
//KILE_DEBUG() << "==LatexOutputFilter::updateFileStackHeuristic()================" << endl;
- static TQString::TQString strPartialFileName;
+ static TQString strPartialFileName;
bool expectFileName = (dwCookie == FileNameHeuristic);
int index = 0;
@@ -282,10 +282,10 @@ bool LatexOutputFilter::detectError(const TQString & strLine, short &dwCookie)
bool found = false, flush = false;
- static TQRegExp::TQRegExp reLaTeXError("^! LaTeX Error: (.*)$", false);
- static TQRegExp::TQRegExp rePDFLaTeXError("^Error: pdflatex (.*)$", false);
- static TQRegExp::TQRegExp reTeXError("^! (.*)");
- static TQRegExp::TQRegExp reLineNumber("^l\\.([0-9]+)(.*)");
+ static TQRegExp reLaTeXError("^! LaTeX Error: (.*)$", false);
+ static TQRegExp rePDFLaTeXError("^Error: pdflatex (.*)$", false);
+ static TQRegExp reTeXError("^! (.*)");
+ static TQRegExp reLineNumber("^l\\.([0-9]+)(.*)");
switch (dwCookie)
{
@@ -370,9 +370,9 @@ bool LatexOutputFilter::detectWarning(const TQString & strLine, short &dwCookie)
bool found = false, flush = false;
TQString warning;
- static TQRegExp::TQRegExp reLaTeXWarning("^(((! )?(La|pdf)TeX)|Package) .*Warning.*:(.*)", false);
- static TQRegExp::TQRegExp reNoFile("No file (.*)");
- static TQRegExp::TQRegExp 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 TQRegExp reLaTeXWarning("^(((! )?(La|pdf)TeX)|Package) .*Warning.*:(.*)", false);
+ static TQRegExp reNoFile("No file (.*)");
+ static TQRegExp 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::detectLaTeXLineNumber(TQString & warning, short & dwCook
{
//KILE_DEBUG() << "==LatexOutputFilter::detectLaTeXLineNumber(" << warning.length() << ")================" << endl;
- static TQRegExp::TQRegExp reLaTeXLineNumber("(.*) on input line ([0-9]+)\\.$", false);
- static TQRegExp::TQRegExp reInternationalLaTeXLineNumber("(.*)([0-9]+)\\.$", false);
+ static TQRegExp reLaTeXLineNumber("(.*) on input line ([0-9]+)\\.$", false);
+ static TQRegExp reInternationalLaTeXLineNumber("(.*)([0-9]+)\\.$", false);
if ( (reLaTeXLineNumber.search(warning) != -1) || (reInternationalLaTeXLineNumber.search(warning) != -1) )
{
//KILE_DEBUG() << "een" << endl;
@@ -478,7 +478,7 @@ bool LatexOutputFilter::detectBadBox(const TQString & strLine, short & dwCookie)
bool found = false, flush = false;
TQString badbox;
- static TQRegExp::TQRegExp reBadBox("^(Over|Under)(full \\\\[hv]box .*)", false);
+ static TQRegExp reBadBox("^(Over|Under)(full \\\\[hv]box .*)", false);
switch (dwCookie)
{
@@ -517,11 +517,11 @@ bool LatexOutputFilter::detectBadBoxLineNumber(TQString & strLine, short & dwCoo
{
//KILE_DEBUG() << "==LatexOutputFilter::detectBadBoxLineNumber(" << strLine.length() << ")================" << endl;
- static TQRegExp::TQRegExp reBadBoxLines("(.*) at lines ([0-9]+)--([0-9]+)", false);
- static TQRegExp::TQRegExp reBadBoxLine("(.*) at line ([0-9]+)", false);
+ static TQRegExp reBadBoxLines("(.*) at lines ([0-9]+)--([0-9]+)", false);
+ static TQRegExp 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 TQRegExp::TQRegExp reBadBoxOutput("(.*)has occurred while \\output is active^", false);
+ static TQRegExp reBadBoxOutput("(.*)has occurred while \\output is active^", false);
if ( reBadBoxLines.search(strLine) != -1)
{