diff options
Diffstat (limited to 'languages')
| -rw-r--r-- | languages/cpp/addattributedialog.cpp | 4 | ||||
| -rw-r--r-- | languages/cpp/addmethoddialog.cpp | 4 | ||||
| -rw-r--r-- | languages/cpp/backgroundparser.cpp | 4 | ||||
| -rw-r--r-- | languages/cpp/cppcodecompletion.cpp | 6 | ||||
| -rw-r--r-- | languages/cpp/cppsupportpart.cpp | 2 | ||||
| -rw-r--r-- | languages/cpp/tqtdesignercppintegration.cpp | 4 | ||||
| -rw-r--r-- | languages/java/backgroundparser.cpp | 2 | ||||
| -rw-r--r-- | languages/java/javasupportpart.cpp | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index d6dd5290..0808d7af 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -100,7 +100,7 @@ void AddAttributeDialog::accept() int varEndLine, varEndColumn; ( *it ) ->getEndPosition( &varEndLine, &varEndColumn ); TQString access = accessID( *it ); - TQPair<int, int> varEndPoint = tqMakePair( varEndLine, varEndColumn ); + TQPair<int, int> varEndPoint = qMakePair( varEndLine, varEndColumn ); if ( !points.contains( access ) || points[ access ] < varEndPoint ) { @@ -139,7 +139,7 @@ void AddAttributeDialog::accept() else { str.prepend( access + ":\n" ); - points[ *it ] = tqMakePair( line - 1, 0 ); + points[ *it ] = qMakePair( line - 1, 0 ); pt = points[ *it ]; // end of class declaration } diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index e4b19c18..79ec1e65 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -166,7 +166,7 @@ void AddMethodDialog::accept() int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); TQString access = accessID( *it ); - TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); + TQPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) { @@ -206,7 +206,7 @@ void AddMethodDialog::accept() else { str.prepend( access + ":\n" ); - points[ *it ] = tqMakePair( line - 1, 0 ); + points[ *it ] = qMakePair( line - 1, 0 ); pt = points[ *it ]; // end of class declaration } diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index a4ad9fed..a111acde 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -182,14 +182,14 @@ public: { SafeString s( fileName.ascii() ); TQMutexLocker locker( &m_mutex ); - m_fileList.push_front( tqMakePair( s, readFromDisk ) ); + m_fileList.push_front( qMakePair( s, readFromDisk ) ); } void push_back( const TQString& fileName, bool readFromDisk = false ) { SafeString s( fileName.ascii() ); TQMutexLocker locker( &m_mutex ); - m_fileList.push_back( tqMakePair( s, readFromDisk ) ); + m_fileList.push_back( qMakePair( s, readFromDisk ) ); } void pop_front() diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index b032ac72..a62087ac 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -856,14 +856,14 @@ struct CppCodeCompletionData { if ( recoveryPoints.count() == 0 ) return 0; - TQPair<int, int> pt = tqMakePair( line, column ); + TQPair<int, int> pt = qMakePair( line, column ); TQPtrListIterator<RecoveryPoint> it( recoveryPoints ); RecoveryPoint* recPt = 0; while ( it.current() ) { - TQPair<int, int> startPt = tqMakePair( it.current() ->startLine, it.current() ->startColumn ); - TQPair<int, int> endPt = tqMakePair( it.current() ->endLine, it.current() ->endColumn ); + TQPair<int, int> startPt = qMakePair( it.current() ->startLine, it.current() ->startColumn ); + TQPair<int, int> endPt = qMakePair( it.current() ->endLine, it.current() ->endColumn ); if ( pt < startPt ) { break; diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index c1cf0132..bd35d649 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -1506,7 +1506,7 @@ bool CppSupportPart::parseProject( bool force ) uint offset; _jd->stream >> fn >> ts >> offset; - _jd->pcs[ fn ] = tqMakePair( ts, offset ); + _jd->pcs[ fn ] = qMakePair( ts, offset ); } } } diff --git a/languages/cpp/tqtdesignercppintegration.cpp b/languages/cpp/tqtdesignercppintegration.cpp index 6132f758..10472ad8 100644 --- a/languages/cpp/tqtdesignercppintegration.cpp +++ b/languages/cpp/tqtdesignercppintegration.cpp @@ -68,7 +68,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); TQString access = accessID( *it ); - TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); + TQPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) { @@ -98,7 +98,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function else { str.prepend( access + ":\n" ); - points[ access ] = tqMakePair( line - 1, 0 ); + points[ access ] = qMakePair( line - 1, 0 ); pt = points[ access ]; // end of class declaration } diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index d6a034e4..7c63a63f 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -137,7 +137,7 @@ public: void push_back( const TQString& fileName, bool readFromDisk=false ) { TQMutexLocker locker( &m_mutex ); - m_fileList.append( tqMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?! + m_fileList.append( qMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?! } void pop_front() diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 50571ba6..80203576 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -531,7 +531,7 @@ JavaSupportPart::parseProject( ) uint offset; stream >> fn >> ts >> offset; - pcs[ fn ] = tqMakePair( ts, offset ); + pcs[ fn ] = qMakePair( ts, offset ); } } } |