From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson 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 --- parts/outputviews/makeitem.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'parts/outputviews/makeitem.cpp') diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp index 218bb894..fe1f8424 100644 --- a/parts/outputviews/makeitem.cpp +++ b/parts/outputviews/makeitem.cpp @@ -84,12 +84,8 @@ TQString MakeItem::formattedText( EOutputLevel level, bool bright_bg ) TQString MakeItem::br() { - // Qt >= 3.1 doesn't need a
. -#if QT_VERSION < 0x040000 - static const TQString br = TQString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "
"; -#else + // TQt >= 3.1 doesn't need a
. static const TQString br; -#endif return br; } @@ -128,7 +124,7 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus ) m_text = i18n("*** Compilation aborted ***"); if ( m_normalExit ) if (m_exitStatus ) - m_text = i18n("*** Exited with status: %1 ***").arg( m_exitStatus ); + m_text = i18n("*** Exited with status: %1 ***").tqarg( m_exitStatus ); else m_text = i18n("*** Success ***"); } @@ -143,14 +139,14 @@ bool DirectoryItem::m_showDirectoryMessages = true; TQString EnteringDirectoryItem::text( EOutputLevel outputLevel ) { if ( outputLevel < eFull ) - return i18n("Entering directory %1").arg( directory ); + return i18n("Entering directory %1").tqarg( directory ); return m_text; } TQString ExitingDirectoryItem::text( EOutputLevel outputLevel ) { if ( outputLevel < eFull ) - return i18n("Leaving directory %1").arg( directory ); + return i18n("Leaving directory %1").tqarg( directory ); return m_text; } -- cgit v1.2.1