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 --- src/editorproxy.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/editorproxy.cpp') diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index a0c42da3..0cf0e3f1 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -82,7 +82,7 @@ void EditorProxy::setLineNumber(KParts::Part *part, int lineNum, int col) { #if KDE_IS_VERSION(3,5,5) #else - if (!part->widget()->hasFocus()) //workaround for QXIMInputContext crashes. Keep for KDE <=3.5.4! + if (!part->widget()->hasFocus()) //workaround for TQXIMInputContext crashes. Keep for KDE <=3.5.4! { m_delayedPart = part; m_delayedLine = lineNum; @@ -163,9 +163,9 @@ void EditorProxy::popupAboutToShow() for (int index=popup->count()-1; index >= 0; --index) { int id = popup->idAt(index); - if (m_popupIds.contains(id) == 0) + if (m_popupIds.tqcontains(id) == 0) { - TQMenuItem *item = popup->findItem(id); + TQMenuItem *item = popup->tqfindItem(id); if ( item && item->popup() ) delete item->popup(); else @@ -182,7 +182,7 @@ void EditorProxy::popupAboutToShow() TQString wordstr; TQString selection = KDevEditorUtil::currentSelection( doc ); - if ( !selection.isEmpty() && selection.contains('\n') != 0 ) + if ( !selection.isEmpty() && selection.tqcontains('\n') != 0 ) { wordstr = selection; } @@ -201,7 +201,7 @@ void EditorProxy::popupAboutToShow() for( uint i = 0; i < popup->count(); ) { int id = popup->idAt( i ); - if( lastWasSeparator && popup->findItem( id )->isSeparator() ) + if( lastWasSeparator && popup->tqfindItem( id )->isSeparator() ) { popup->removeItem( id ); // Since we removed an item, don't increment i -- cgit v1.2.3