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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit aefcba8280)

kdevdesigner/designer/actiondnd.cpp

@@ -171,7 +171,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
     if ( orientation() ==TQt::Horizontal )
 	flags |= TQStyle::Style_Horizontal;
 
-    style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
+    style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
 			   colorGroup(), flags );
 }
 

kdevdesigner/designer/menubareditor.cpp

@@ -585,7 +585,7 @@ void MenuBarEditor::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
     TQRect r = rect();
-    style().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
+    style().drawPrimitive( TQStyle::PE_PanelMenuBar, &p,
 			   r, colorGroup() );
     drawItems( p );
 }

kdevdesigner/designer/outputwindow.cpp

@@ -57,14 +57,14 @@ OutputWindow::~OutputWindow()
     debugoutput = debugView = 0;
     errorView = 0;
     if ( !debugToStderr )
-	tqInstallMsgHandler( oldMsgHandler );
+	qInstallMsgHandler( oldMsgHandler );
     delete iface;
 }
 
 void OutputWindow::shuttingDown()
 {
     if ( !debugToStderr )
-	tqInstallMsgHandler( oldMsgHandler );
+	qInstallMsgHandler( oldMsgHandler );
 }
 
 void OutputWindow::setupError()
@@ -119,7 +119,7 @@ void OutputWindow::setupDebug()
     addTab( debugView, "Debug Output" );
 
     if ( !debugToStderr )
-	oldMsgHandler = tqInstallMsgHandler( debugMessageOutput );
+	oldMsgHandler = qInstallMsgHandler( debugMessageOutput );
 }
 
 void OutputWindow::setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines,

kdevdesigner/designer/popupmenueditor.cpp

@@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * )
 		 rect().width() - borderSize * 2, rect().height() - borderSize * 2 );
     reg -= mid;
     p.setClipRegion( reg );
-    style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
+    style().drawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
     p.restore();
     drawItems( &p );
 }
@@ -1034,7 +1034,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
 
     if ( i->isSeparator() ) {
-	style().tqdrawPrimitive( TQStyle::PE_Separator, p,
+	style().drawPrimitive( TQStyle::PE_Separator, p,
 			       TQRect( r.x(), r.y() + 2, r.width(), 1 ),
 			       colorGroup(), TQStyle::Style_Sunken | f );
 	return;
@@ -1042,7 +1042,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
 
     const TQAction * a = i->action();
     if ( a->isToggleAction() && a->isOn() ) {
-	style().tqdrawPrimitive( TQStyle::PE_CheckMark, p,
+	style().drawPrimitive( TQStyle::PE_CheckMark, p,
 			       TQRect( x , y, iconWidth, h ),
 			       colorGroup(), f );
     } else {
@@ -1064,7 +1064,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
 		 TQPainter::AlignLeft | TQPainter::AlignVCenter,
 		 a->accel() );
     if ( i->count() ) // Item has submenu
-	style().tqdrawPrimitive( TQStyle::PE_ArrowRight, p,
+	style().drawPrimitive( TQStyle::PE_ArrowRight, p,
 			       TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ),
 			       colorGroup(), f );
 }

kdevdesigner/designer/propertyeditor.cpp

@@ -294,7 +294,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg,
 void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r )
 {
     p->save();
-    TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg,
+    TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg,
 					TQStyle::Style_Sunken, TQStyleOption(1,1) );
     p->restore();
 }

kdevdesigner/designer/styledbutton.cpp

@@ -151,12 +151,12 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
 
 void StyledButton::drawButton( TQPainter *paint )
 {
-    style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
+    style().drawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
 			  isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
     drawButtonLabel(paint);
 
     if (hasFocus())
-	style().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
+	style().drawPrimitive(TQStyle::PE_FocusRect, paint,
 			      style().subRect(TQStyle::SR_PushButtonFocusRect, this),
 			      colorGroup(), TQStyle::Style_Default);
 }

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
 			}
 			

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
 			}
 

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()

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;

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 );
 			}
 		}
 	}

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
 	}
 

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()

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 );
 	    }
 	}
     }

lib/cppparser/lexer.cpp

@@ -514,7 +514,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 )

lib/util/configwidgetproxy.cpp

@@ -43,12 +43,12 @@ ConfigWidgetProxy::~ConfigWidgetProxy()
 
 void ConfigWidgetProxy::createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon )
 {
-	_globalTitleMap.insert( pagenumber, tqMakePair( title, icon ) );
+	_globalTitleMap.insert( pagenumber, qMakePair( title, icon ) );
 }
 
 void ConfigWidgetProxy::createProjectConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon )
 {
-	_projectTitleMap.insert( pagenumber, tqMakePair( title, icon ) );
+	_projectTitleMap.insert( pagenumber, qMakePair( title, icon ) );
 }
 
 void ConfigWidgetProxy::removeConfigPage( int pagenumber )

lib/widgets/qcomboview.cpp

@@ -290,7 +290,7 @@ TQSize QComboView::sizeHint() const
             maxW = w;
     }
 */
-    d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, this,
+    d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this,
         TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()));
 
     return d->sizeHint;

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;
 		}

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;

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 ));

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));

src/multibuffer.cpp

@@ -147,7 +147,7 @@ void MultiBuffer::registerURL( const KURL &url, KParts::Part *part )
 void MultiBuffer::registerDelayedActivation( KParts::Part *part,
         int line, int col )
 {
-    m_delayedActivation[ part ] = tqMakePair( line, col );
+    m_delayedActivation[ part ] = qMakePair( line, col );
 }
 
 KParts::Part* MultiBuffer::createPart( const TQString &mimeType,

src/newui/button.cpp

@@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const
             h = TQMAX(h, sz.height());
     }
 
-    return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+    return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
             expandedTo(TQApplication::globalStrut()));
 }
 

src/newui/docksplitter.cpp

@@ -166,8 +166,8 @@ TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock)
     for (uint i = 0; i < m_docks.count(); ++i)
         for (uint j = 0; j < m_docks[i].count(); ++j)
             if (dock == m_docks[i][j])
-                return tqMakePair(i, j);
-    return tqMakePair(0u, 0u);
+                return qMakePair(i, j);
+    return qMakePair(0u, 0u);
 }
 
 }

src/simplemainwindow.cpp

@@ -772,12 +772,12 @@ void SimpleMainWindow::fillWindowMenu()
     int i = 0;
 
     if (list.count() > 0)
-        m_windowList << tqMakePair(m_windowMenu->insertSeparator(), KURL());
+        m_windowList << qMakePair(m_windowMenu->insertSeparator(), KURL());
 
     while (itt != list.end())
     {
         temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() );
-        m_windowList << tqMakePair(temp, *itt);
+        m_windowList << qMakePair(temp, *itt);
         ++i;
         ++itt;
     }