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 --- languages/cpp/cppcodecompletion.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'languages/cpp/cppcodecompletion.h') diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 67f7b10b..4b619984 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -46,14 +46,15 @@ #include class PopupTracker : public TQObject { Q_OBJECT + TQ_OBJECT public: static PopupTracker* pt; static uint pendingPopups; - static TQPopupMenu* createPopup( TQWidget* parent ) { + static TQPopupMenu* createPopup( TQWidget* tqparent ) { if( !pt ) pt = new PopupTracker(); - TQPopupMenu* m = new TQPopupMenu( parent ); + TQPopupMenu* m = new TQPopupMenu( tqparent ); ++pendingPopups; connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) ); return m; @@ -91,9 +92,10 @@ struct ExpressionInfo; typedef KSharedPtr TypePointer; -class CppCodeCompletion : public QObject +class CppCodeCompletion : public TQObject { Q_OBJECT + TQ_OBJECT public: friend class SimpleType; enum CompletionMode @@ -187,8 +189,8 @@ private: bool functionContains( FunctionDom f , int line, int col ); void getFunctionBody( FunctionDom f , int& line, int& col ); void selectItem( ItemDom item ); - void addTypePopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); - void addTypeClassPopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypePopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypeClassPopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); TQValueList computeSignatureList( CppEvaluation::EvaluationResult function ); void integratePart( KParts::Part* part ); void setupCodeInformationRepository(); @@ -233,8 +235,8 @@ private: void computeCompletionEntryList( SimpleType type, TQValueList& entryList, NamespaceDom scope, bool isInstance, int depth ); void computeCompletionEntryList( SimpleType type, TQValueList& entryList, const FunctionList& methods, bool isInstance, int depth ); void computeCompletionEntryList( SimpleType type, TQValueList& entryList, const VariableList& attributes, bool isInstance, int depth ); - void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList& entryList, const ClassList& lst, bool isInstance, int depth ); - void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList& entryList, const TypeAliasList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList& entryList, const ClassList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList& entryList, const TypeAliasList& lst, bool isInstance, int depth ); void computeCompletionEntryList( SimpleType type, TQValueList& entryList, const NamespaceList& lst, bool isInstance, int depth ); SimpleContext* computeContext( FunctionDefinitionAST* ast, int line, int col, int lineOffset, int colOffset ); @@ -266,7 +268,7 @@ private: TQGuardedPtr m_pSupport; TQTimer* m_ccTimer; TQTimer* m_showStatusTextTimer; - TQValueList > m_statusTextList; + TQValueList > m_statusTextList; void fitContextItem( int nLine, int nColumn ); void needRecoveryPoints(); @@ -296,8 +298,8 @@ private: //If more then the given count of comments were requested, all following ones will be blank.(Performance-reasons) void setMaxComments( int count ); - TQString commentFromItem( const SimpleType& parent, const ItemDom& item ); - TQString commentFromTag( const SimpleType& parent, Tag& tag ); + TQString commentFromItem( const SimpleType& tqparent, const ItemDom& item ); + TQString commentFromTag( const SimpleType& tqparent, Tag& tag ); ItemDom m_cachedFromContext; ///Can be a function or a class, representing the position from where the last completion was started. Necessary as long as all imports are put into the global namespace. -- cgit v1.2.1