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 --- kdevdesigner/designer/outputwindow.cpp | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'kdevdesigner/designer/outputwindow.cpp') diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index 17477a95..ec7418db 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -42,10 +42,10 @@ static TQTextEdit *debugoutput = 0; bool debugToStderr = FALSE; -QtMsgHandler OutputWindow::oldMsgHandler = 0; +TQtMsgHandler OutputWindow::oldMsgHandler = 0; -OutputWindow::OutputWindow( TQWidget *parent ) - : TQTabWidget( parent, "output_window" ), debugView( 0 ), errorView( 0 ) +OutputWindow::OutputWindow( TQWidget *tqparent ) + : TQTabWidget( tqparent, "output_window" ), debugView( 0 ), errorView( 0 ) { setupDebug(); setupError(); @@ -57,14 +57,14 @@ OutputWindow::~OutputWindow() debugoutput = debugView = 0; errorView = 0; if ( !debugToStderr ) - qInstallMsgHandler( oldMsgHandler ); + tqInstallMsgHandler( oldMsgHandler ); delete iface; } void OutputWindow::shuttingDown() { if ( !debugToStderr ) - qInstallMsgHandler( oldMsgHandler ); + tqInstallMsgHandler( oldMsgHandler ); } void OutputWindow::setupError() @@ -86,13 +86,13 @@ void OutputWindow::setupError() errorView->addColumn( i18n( "Location" ) ); errorView->setResizeMode( TQListView::LastColumn ); errorView->setColumnWidth( 0, errorView->fontMetrics().width( "WARNING1234" ) ); - errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOP" ) ); + errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPTQRSTUVWXYZABCDEFGHIJKLMNOPTQRSTUVWXYZABCDEFGHIJKLMNOP" ) ); errorView->setColumnWidth( 2, errorView->fontMetrics().width( "9999999" ) ); - errorView->setColumnAlignment( 2, Qt::AlignRight ); + errorView->setColumnAlignment( 2, TQt::AlignRight ); errorView->setAllColumnsShowFocus( TRUE ); } -static void debugMessageOutput( QtMsgType type, const char *msg ) +static void debugMessageOutput( TQtMsgType type, const char *msg ) { TQString s( msg ); s += "\n"; @@ -109,7 +109,7 @@ static void debugMessageOutput( QtMsgType type, const char *msg ) abort(); } - qApp->flush(); + tqApp->flush(); } void OutputWindow::setupDebug() @@ -119,7 +119,7 @@ void OutputWindow::setupDebug() addTab( debugView, "Debug Output" ); if ( !debugToStderr ) - oldMsgHandler = qInstallMsgHandler( debugMessageOutput ); + oldMsgHandler = tqInstallMsgHandler( debugMessageOutput ); } void OutputWindow::setErrorMessages( const TQStringList &errors, const TQValueList &lines, @@ -175,14 +175,14 @@ void OutputWindow::currentErrorChanged( TQListViewItem *i ) -ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line, +ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line, const TQString &locationString, TQObject *locationObject ) - : TQListViewItem( parent, after ) + : TQListViewItem( tqparent, after ) { setMultiLinesEnabled( TRUE ); TQString m( message ); type = m.startsWith( "Warning: " ) ? Warning : Error; - m = m.mid( m.find( ':' ) + 1 ); + m = m.mid( m.tqfind( ':' ) + 1 ); setText( 0, type == Error ? "Error" : "Warning" ); setText( 1, m ); setText( 2, TQString::number( line ) ); @@ -190,20 +190,20 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString object = locationObject; read = !after; if ( !after ) { - parent->setSelected( this, TRUE ); - parent->setCurrentItem( this ); + tqparent->setSelected( this, TRUE ); + tqparent->setCurrentItem( this ); } } void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { TQColorGroup g( cg ); - g.setColor( TQColorGroup::Text, type == Error ? Qt::red : Qt::darkYellow ); + g.setColor( TQColorGroup::Text, type == Error ? TQt::red : TQt::darkYellow ); if ( !read ) { TQFont f( p->font() ); f.setBold( TRUE ); p->setFont( f ); } - TQListViewItem::paintCell( p, g, column, width, alignment ); + TQListViewItem::paintCell( p, g, column, width, tqalignment ); } -- cgit v1.2.1