From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 languages/cpp/doxydoc.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'languages/cpp/doxydoc.cpp')

diff --git a/languages/cpp/doxydoc.cpp b/languages/cpp/doxydoc.cpp
index 54343b70..1f35708c 100644
--- a/languages/cpp/doxydoc.cpp
+++ b/languages/cpp/doxydoc.cpp
@@ -20,7 +20,7 @@
 
 void DoxyDoc::formatType( TQString& str )
 {
-	str.replace( TQRegExp( " " ), "" );
+	str.tqreplace( TQRegExp( " " ), "" );
 }
 
 DoxyDoc::DoxyDoc( const TQStringList& dir )
@@ -36,7 +36,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 	TQString scope = tmpscope;
 	bool foundfile = false;
 	//produce doxygen conform filenames
-	TQString filename = "/class" + scope.replace( TQRegExp( "_" ), "__" ).replace( TQRegExp( "::" ), "_1_1" ) + ".xml";
+	TQString filename = "/class" + scope.tqreplace( TQRegExp( "_" ), "__" ).tqreplace( TQRegExp( "::" ), "_1_1" ) + ".xml";
 	
 	//search for file in all directories
 	for ( std::list<TQDir>::const_iterator ci = m_dirs.begin(); !foundfile && ci != m_dirs.end(); ++ci )
@@ -53,7 +53,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 					return "";
 				}
 				TQDomDocument m_doc;
-				m_doc.setContent( m_file.readAll() );
+				m_doc.setContent( TQByteArray(m_file.readAll()) );
 				m_file.close();
 				m_list = m_doc.elementsByTagName( "memberdef" );
 				foundfile = true;
@@ -64,7 +64,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 		}
 	}
 	if ( !foundfile )
-		return TQString::null;
+		return TQString();
 	
 	TQString type = tmptype;
 	formatType( type );
@@ -134,7 +134,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 					description += "<b>Parameterlist:</b><p>" + paramstr;
 				
 				if ( description == "" )
-					return TQString::null;
+					return TQString();
 				else
 					return description;
 			}
@@ -142,7 +142,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 		
 	}
 	
-	return TQString::null;
+	return TQString();
 }
 
 //kate: indent-mode csands; tab-width 4; space-indent off;
-- 
cgit v1.2.1