summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-24 10:56:29 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-25 01:09:37 +0900
commit49d88f1853b0e3f7676c3d09d68a8c4ae4b2f6dc (patch)
treec2164e013e8b50b0cb39e6a55ebb4f3403aefdc5
parent11ec7d48f6886e33ee25332e8a20c1265905a2d5 (diff)
downloadtdesdk-49d88f1853b0e3f7676c3d09d68a8c4ae4b2f6dc.tar.gz
tdesdk-49d88f1853b0e3f7676c3d09d68a8c4ae4b2f6dc.zip
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 30ea27ebf399fff691cefe16c9e16a1809f0fffe)
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/database.cpp4
-rw-r--r--tdecachegrind/tdecachegrind/callgraphview.cpp4
-rw-r--r--tdecachegrind/tdecachegrind/treemap.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
index 18fe72c6..aa64a4b0 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
@@ -174,7 +174,7 @@ DataBaseInterface::MainEntry DataBaseInterface::get(const TQString& query,Search
// kdDebug(0) << "MAINDB->GET returned: " << r << endl;
if(counter%5==0) kapp->processEvents(100);
// kdDebug(0) << "events processed" << endl;
- return tqMakePair(k,d);
+ return qMakePair(k,d);
}
@@ -727,7 +727,7 @@ DataBaseInterface::MainEntry DataBaseInterface::getSentence( const TQString & qu
DBItemMainData d;
sentence->get(&k,&d);
if(counter%5==0) kapp->processEvents(100);
- return tqMakePair(k,d);
+ return qMakePair(k,d);
}
diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index 8a023eb6..bf87b28a 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -805,7 +805,7 @@ GraphNode* GraphExporter::node(TraceFunction* f)
GraphEdge* GraphExporter::edge(TraceFunction* f1, TraceFunction* f2)
{
- GraphEdgeMap::Iterator it = _edgeMap.find(tqMakePair(f1, f2));
+ GraphEdgeMap::Iterator it = _edgeMap.find(qMakePair(f1, f2));
if (it == _edgeMap.end()) return 0;
return &(*it);
@@ -1095,7 +1095,7 @@ void CanvasNode::drawShape(TQPainter& p)
r.setRect(r.x()+2, r.y()+2, r.width()-4, r.height()-4);
if (StoredDrawParams::selected() && _view->hasFocus()) {
- _view->style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r,
+ _view->style().drawPrimitive( TQStyle::PE_FocusRect, &p, r,
_view->colorGroup());
}
diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp
index f70f4a4f..9f771d51 100644
--- a/tdecachegrind/tdecachegrind/treemap.cpp
+++ b/tdecachegrind/tdecachegrind/treemap.cpp
@@ -2178,7 +2178,7 @@ void TreeMapWidget::drawTreeMap()
if (hasFocus()) {
TQPainter p(this);
- style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+ style().drawPrimitive( TQStyle::PE_FocusRect, &p,
TQRect(0, 0, TQWidget::width(), TQWidget::height()),
colorGroup() );
}
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index 976888c1..a1d2f061 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -504,7 +504,7 @@ void Lexer::resetSkipWords()
void Lexer::addSkipWord( const TQString& word, SkipType skipType, const TQString& str )
{
- m_words[ word ] = tqMakePair( skipType, str );
+ m_words[ word ] = qMakePair( skipType, str );
}
void Lexer::skip( int l, int r )