TDE
/
tdevelop
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/31/head
Michele Calgaro 1 year ago
parent 42d2a4fcec
commit aefcba8280
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
25 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
kdevdesigner/designer/actiondnd.cpp
Unescape View File

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

2
kdevdesigner/designer/menubareditor.cpp
Unescape View File

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

6
kdevdesigner/designer/outputwindow.cpp
Unescape View File

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

8
kdevdesigner/designer/popupmenueditor.cpp
Unescape View File

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

2
kdevdesigner/designer/propertyeditor.cpp
Unescape View File

@ -294,7 +294,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg,
void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r ) void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r )
{ {
p->save(); 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) ); TQStyle::Style_Sunken, TQStyleOption(1,1) );
p->restore(); p->restore();
} }

4
kdevdesigner/designer/styledbutton.cpp
Unescape View File

@ -151,12 +151,12 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
void StyledButton::drawButton( TQPainter *paint ) 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); isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
drawButtonLabel(paint); drawButtonLabel(paint);
if (hasFocus()) if (hasFocus())
style().tqdrawPrimitive(TQStyle::PE_FocusRect, paint, style().drawPrimitive(TQStyle::PE_FocusRect, paint,
style().subRect(TQStyle::SR_PushButtonFocusRect, this), style().subRect(TQStyle::SR_PushButtonFocusRect, this),
colorGroup(), TQStyle::Style_Default); colorGroup(), TQStyle::Style_Default);
} }

4
languages/cpp/addattributedialog.cpp
Unescape View File

@ -100,7 +100,7 @@ void AddAttributeDialog::accept()
int varEndLine, varEndColumn; int varEndLine, varEndColumn;
( *it ) ->getEndPosition( &varEndLine, &varEndColumn ); ( *it ) ->getEndPosition( &varEndLine, &varEndColumn );
TQString access = accessID( *it ); 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 ) if ( !points.contains( access ) || points[ access ] < varEndPoint )
{ {
@ -139,7 +139,7 @@ void AddAttributeDialog::accept()
else else
{ {
str.prepend( access + ":\n" ); str.prepend( access + ":\n" );
points[ *it ] = tqMakePair( line - 1, 0 ); points[ *it ] = qMakePair( line - 1, 0 );
pt = points[ *it ]; // end of class declaration pt = points[ *it ]; // end of class declaration
} }

4
languages/cpp/addmethoddialog.cpp
Unescape View File

@ -166,7 +166,7 @@ void AddMethodDialog::accept()
int funEndLine, funEndColumn; int funEndLine, funEndColumn;
( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); ( *it ) ->getEndPosition( &funEndLine, &funEndColumn );
TQString access = accessID( *it ); 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 ) if ( !points.contains( access ) || points[ access ] < funEndPoint )
{ {
@ -206,7 +206,7 @@ void AddMethodDialog::accept()
else else
{ {
str.prepend( access + ":\n" ); str.prepend( access + ":\n" );
points[ *it ] = tqMakePair( line - 1, 0 ); points[ *it ] = qMakePair( line - 1, 0 );
pt = points[ *it ]; // end of class declaration pt = points[ *it ]; // end of class declaration
} }

4
languages/cpp/backgroundparser.cpp
Unescape View File

@ -182,14 +182,14 @@ public:
{ {
SafeString s( fileName.ascii() ); SafeString s( fileName.ascii() );
TQMutexLocker locker( &m_mutex ); 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 ) void push_back( const TQString& fileName, bool readFromDisk = false )
{ {
SafeString s( fileName.ascii() ); SafeString s( fileName.ascii() );
TQMutexLocker locker( &m_mutex ); TQMutexLocker locker( &m_mutex );
m_fileList.push_back( tqMakePair( s, readFromDisk ) ); m_fileList.push_back( qMakePair( s, readFromDisk ) );
} }
void pop_front() void pop_front()

6
languages/cpp/cppcodecompletion.cpp
Unescape View File

@ -856,14 +856,14 @@ struct CppCodeCompletionData {
if ( recoveryPoints.count() == 0 ) if ( recoveryPoints.count() == 0 )
return 0; return 0;
TQPair<int, int> pt = tqMakePair( line, column ); TQPair<int, int> pt = qMakePair( line, column );
TQPtrListIterator<RecoveryPoint> it( recoveryPoints ); TQPtrListIterator<RecoveryPoint> it( recoveryPoints );
RecoveryPoint* recPt = 0; RecoveryPoint* recPt = 0;
while ( it.current() ) { while ( it.current() ) {
TQPair<int, int> startPt = tqMakePair( it.current() ->startLine, it.current() ->startColumn ); TQPair<int, int> startPt = qMakePair( it.current() ->startLine, it.current() ->startColumn );
TQPair<int, int> endPt = tqMakePair( it.current() ->endLine, it.current() ->endColumn ); TQPair<int, int> endPt = qMakePair( it.current() ->endLine, it.current() ->endColumn );
if ( pt < startPt ) { if ( pt < startPt ) {
break; break;

2
languages/cpp/cppsupportpart.cpp
Unescape View File

@ -1506,7 +1506,7 @@ bool CppSupportPart::parseProject( bool force )
uint offset; uint offset;
_jd->stream >> fn >> ts >> offset; _jd->stream >> fn >> ts >> offset;
_jd->pcs[ fn ] = tqMakePair( ts, offset ); _jd->pcs[ fn ] = qMakePair( ts, offset );
} }
} }
} }

4
languages/cpp/tqtdesignercppintegration.cpp
Unescape View File

@ -68,7 +68,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
int funEndLine, funEndColumn; int funEndLine, funEndColumn;
( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); ( *it ) ->getEndPosition( &funEndLine, &funEndColumn );
TQString access = accessID( *it ); 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 ) if ( !points.contains( access ) || points[ access ] < funEndPoint )
{ {
@ -98,7 +98,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
else else
{ {
str.prepend( access + ":\n" ); str.prepend( access + ":\n" );
points[ access ] = tqMakePair( line - 1, 0 ); points[ access ] = qMakePair( line - 1, 0 );
pt = points[ access ]; // end of class declaration pt = points[ access ]; // end of class declaration
} }

2
languages/java/backgroundparser.cpp
Unescape View File

@ -137,7 +137,7 @@ public:
void push_back( const TQString& fileName, bool readFromDisk=false ) void push_back( const TQString& fileName, bool readFromDisk=false )
{ {
TQMutexLocker locker( &m_mutex ); 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() void pop_front()

2
languages/java/javasupportpart.cpp
Unescape View File

@ -531,7 +531,7 @@ JavaSupportPart::parseProject( )
uint offset; uint offset;
stream >> fn >> ts >> offset; stream >> fn >> ts >> offset;
pcs[ fn ] = tqMakePair( ts, offset ); pcs[ fn ] = qMakePair( ts, offset );
} }
} }
} }

2
lib/cppparser/lexer.cpp
Unescape View File

@ -514,7 +514,7 @@ void Lexer::resetSkipWords()
void Lexer::addSkipWord( const TQString& word, SkipType skipType, const TQString& str ) 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 ) void Lexer::skip( int l, int r )

4
lib/util/configwidgetproxy.cpp
Unescape View File

@ -43,12 +43,12 @@ ConfigWidgetProxy::~ConfigWidgetProxy()
void ConfigWidgetProxy::createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon ) 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 ) 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 ) void ConfigWidgetProxy::removeConfigPage( int pagenumber )

2
lib/widgets/qcomboview.cpp
Unescape View File

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

4
parts/bookmarks/bookmarks_part.cpp
Unescape View File

@ -203,7 +203,7 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el )
TQString line = mark.attribute( "line" ); TQString line = mark.attribute( "line" );
if ( line != TQString() ) if ( line != TQString() )
{ {
data->marks.append( tqMakePair( line.toInt(), TQString() ) ); data->marks.append( qMakePair( line.toInt(), TQString() ) );
} }
mark = mark.nextSibling().toElement(); mark = mark.nextSibling().toElement();
} }
@ -409,7 +409,7 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part
if ( it.current()->type & KTextEditor::MarkInterface::markType01 ) if ( it.current()->type & KTextEditor::MarkInterface::markType01 )
{ {
int line = it.current()->line; int line = it.current()->line;
data->marks.append( tqMakePair( line, TQString() ) ); data->marks.append( qMakePair( line, TQString() ) );
} }
++it; ++it;
} }

4
parts/documentation/interfaces/kdevdocumentationplugin.cpp
Unescape View File

@ -168,7 +168,7 @@ IndexItem::List IndexItem::urls() const
TQValueList<IndexItemProto*> itemProtos = m_listbox->items[text()]; TQValueList<IndexItemProto*> itemProtos = m_listbox->items[text()];
for (TQValueList<IndexItemProto*>::const_iterator it = itemProtos.begin(); for (TQValueList<IndexItemProto*>::const_iterator it = itemProtos.begin();
it != itemProtos.end(); ++it) it != itemProtos.end(); ++it)
urlList.append(tqMakePair((*it)->description(), (*it)->url())); urlList.append(qMakePair((*it)->description(), (*it)->url()));
return urlList; return urlList;
} }
@ -224,7 +224,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
y = (fm.height() + 2 + marg - boxsize) / 2; y = (fm.height() + 2 + marg - boxsize) / 2;
TQStyleOption opt(this); 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); TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt);
return; return;

4
parts/fileselector/fileselector_widget.cpp
Unescape View File

@ -125,7 +125,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
TQVBoxLayout* lo = new TQVBoxLayout(this); TQVBoxLayout* lo = new TQVBoxLayout(this);
TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar );
KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this); KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this);
toolbar = new KDevFileSelectorToolBar(tbp); toolbar = new KDevFileSelectorToolBar(tbp);
@ -133,7 +133,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
lo->addWidget(tbp); lo->addWidget(tbp);
toolbar->setMovingEnabled(false); toolbar->setMovingEnabled(false);
toolbar->setFlat(true); toolbar->setFlat(true);
tqInstallMsgHandler( oldHandler ); qInstallMsgHandler( oldHandler );
cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));

2
parts/replace/replaceitem.cpp
Unescape View File

@ -116,7 +116,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
else else
y = (fm.height() + 2 + marg - boxsize) / 2; 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, TQRect(x, y, boxsize,
fm.height() + 2 + marg), fm.height() + 2 + marg),
cg, styleflags, TQStyleOption(this)); cg, styleflags, TQStyleOption(this));

2
src/multibuffer.cpp
Unescape View File

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

2
src/newui/button.cpp
Unescape View File

@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const
h = TQMAX(h, sz.height()); 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())); expandedTo(TQApplication::globalStrut()));
} }

4
src/newui/docksplitter.cpp
Unescape View File

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

4
src/simplemainwindow.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save