Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit aefcba8280fc1520675866143baf2f8c020ec82e)

4 files changed, 7 insertions, 7 deletions

diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index 409dfacc..e4dc74a2 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -203,7 +203,7 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el )
 				TQString line = mark.attribute( "line" );
 				if ( line != TQString() )
 				{
-					data->marks.append( tqMakePair( line.toInt(), TQString() ) );
+					data->marks.append( qMakePair( line.toInt(), TQString() ) );
 				}
 				mark = mark.nextSibling().toElement();
 			}
@@ -409,7 +409,7 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part
 			if ( it.current()->type & KTextEditor::MarkInterface::markType01 )
 			{
 			    int line = it.current()->line;
-				data->marks.append( tqMakePair( line, TQString() ) );
+				data->marks.append( qMakePair( line, TQString() ) );
 			}
 			++it;
 		}
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index 0282d82a..7eedf73a 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -168,7 +168,7 @@ IndexItem::List IndexItem::urls() const
     TQValueList<IndexItemProto*> itemProtos = m_listbox->items[text()];
     for (TQValueList<IndexItemProto*>::const_iterator it = itemProtos.begin();
         it != itemProtos.end(); ++it)
-        urlList.append(tqMakePair((*it)->description(), (*it)->url()));
+        urlList.append(qMakePair((*it)->description(), (*it)->url()));
     return urlList;
 }
 
@@ -224,7 +224,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
             y = (fm.height() + 2 + marg - boxsize) / 2;
 
         TQStyleOption opt(this);
-        lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
+        lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p,
             TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt);
                
         return;
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 4925ec72..30b56f9d 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -125,7 +125,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
 
     TQVBoxLayout* lo = new TQVBoxLayout(this);
 
-    TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
+    TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar );
 
     KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this);
     toolbar = new KDevFileSelectorToolBar(tbp);
@@ -133,7 +133,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
     lo->addWidget(tbp);
     toolbar->setMovingEnabled(false);
     toolbar->setFlat(true);
-    tqInstallMsgHandler( oldHandler );
+    qInstallMsgHandler( oldHandler );
 
     cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
     cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp
index 20471d67..ebd92797 100644
--- a/parts/replace/replaceitem.cpp
+++ b/parts/replace/replaceitem.cpp
@@ -116,7 +116,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
     else
         y = (fm.height() + 2 + marg - boxsize) / 2;
 
-    lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
+    lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p,
                               TQRect(x, y, boxsize,
                                     fm.height() + 2 + marg),
                               cg, styleflags, TQStyleOption(this));