summaryrefslogtreecommitdiffstats
path: root/languages/cpp/kdevdriver.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
commit48d4a26399959121f33d2bc3bfe51c7827b654fc (patch)
tree5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /languages/cpp/kdevdriver.cpp
parent7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff)
downloadtdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz
tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip
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
Diffstat (limited to 'languages/cpp/kdevdriver.cpp')
-rw-r--r--languages/cpp/kdevdriver.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp
index f240ed36..9e0918b2 100644
--- a/languages/cpp/kdevdriver.cpp
+++ b/languages/cpp/kdevdriver.cpp
@@ -105,11 +105,11 @@ void KDevDriver::setup()
if( !kdedir.isNull() )
addIncludePath( kdedir + "/include" );
- TQString qmakespec = getenv( "QMAKESPEC" );
+ TQString qmakespec = getenv( "TQMAKESPEC" );
if ( qmakespec.isNull() )
qmakespec = "linux-g++";
- TQString qtdir = getenv( "QTDIR" );
+ TQString qtdir = getenv( "TQTDIR" );
if( !qtdir.isNull() ) {
addIncludePath( qtdir + "/include" );
@@ -130,15 +130,15 @@ void KDevDriver::setup()
}
addMacro( Macro( "__cplusplus", "1" ) );
- addMacro( Macro( "Q_SIGNALS", "signals" ) );
- addMacro( Macro( "Q_SLOTS", "slots" ) );
- addMacro( Macro( "Q_SCRIPTABLE", "" ) );
+ addMacro( Macro( "signals", "signals" ) );
+ addMacro( Macro( "slots", "slots" ) );
+ addMacro( Macro( "TQ_SCRIPTABLE", "" ) );
CppCodeCompletionConfig* cfg = m_cppSupport->codeCompletionConfig();
TQString str = cfg->customIncludePaths();
int pos = 0;
while( pos < str.length() ) {
- int end = str.find( ';', pos );
+ int end = str.tqfind( ';', pos );
if( end == -1 ) {
end = str.length();
}
@@ -175,7 +175,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file );
if( !res.success ) {
- Problem p( i18n( "%1. Message: %2" ).arg( res.errorMessage ).arg( res.longErrorMessage ), 0, 0, Problem::Level_Warning );
+ Problem p( i18n( "%1. Message: %2" ).tqarg( res.errorMessage ).tqarg( res.longErrorMessage ), 0, 0, Problem::Level_Warning );
p.setFileName( file );
addProblem( file, p );
}
@@ -184,15 +184,15 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
}
bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) {
- TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash());
+ TQString compoundString = file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash());
if( !m_shouldParseIncludedFiles )
return false;
- m_cppSupport->safeFileSet().contains( compoundString );
+ m_cppSupport->safeFileSet().tqcontains( compoundString );
- if( m_cppSupport->safeFileSet().contains( file->fileName()) ){
+ if( m_cppSupport->safeFileSet().tqcontains( file->fileName()) ){
return false;
- } else if( m_cppSupport->safeFileSet().contains( compoundString ) ) {
+ } else if( m_cppSupport->safeFileSet().tqcontains( compoundString ) ) {
//kdDebug( 9007 ) << "ALREADY IN FILE-SET: " << compoundString << endl;
return false;
} else {