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

Drop TQT_TQ*_OBJECT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/22/head
Michele Calgaro 10 months ago
parent 93aed1ee0d
commit 19e5278459
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

6
kommander/editor/formwindow.cpp
Unescape View File

@ -1500,7 +1500,7 @@ void FormWindow::invalidCheckedSelections()
void FormWindow::checkPreviewGeometry(TQRect & r) void FormWindow::checkPreviewGeometry(TQRect & r)
{ {
if (TQT_TQRECT_OBJECT(rect()).contains(r)) if (rect().contains(r))
return; return;
if (r.left() < rect().left()) if (r.left() < rect().left())
r.moveTopLeft(TQPoint(0, r.top())); r.moveTopLeft(TQPoint(0, r.top()));
@ -2444,7 +2444,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf)
TQWidget *container = 0; TQWidget *container = 0;
int depth = -1; int depth = -1;
TQWidgetList selected = selectedWidgets(); TQWidgetList selected = selectedWidgets();
if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(pos))) if (rect().contains(mapFromGlobal(pos)))
{ {
container = mainContainer(); container = mainContainer();
depth = widgetDepth(container); depth = widgetDepth(container);
@ -2467,7 +2467,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf)
TQWidget *w = it.current(); TQWidget *w = it.current();
while (w && !w->isTopLevel()) while (w && !w->isTopLevel())
{ {
if (!TQT_TQRECT_OBJECT(w->rect()).contains((w->mapFromGlobal(pos)))) if (!w->rect().contains((w->mapFromGlobal(pos))))
break; break;
w = w->parentWidget(); w = w->parentWidget();
} }

8
kommander/editor/resource.cpp
Unescape View File

@ -1099,9 +1099,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
num = value.toInt(); num = value.toInt();
if ( w && w->inherits( "TQLayout" ) ) { if ( w && w->inherits( "TQLayout" ) ) {
if ( name == "spacing" ) if ( name == "spacing" )
num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) ) );
else if ( name == "margin" ) else if ( name == "margin" )
num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) ) );
} }
ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl; ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl;
break; break;
@ -1117,9 +1117,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
unum = value.toUInt(); unum = value.toUInt();
if ( w && w->inherits( "TQLayout" ) ) { if ( w && w->inherits( "TQLayout" ) ) {
if ( name == "spacing" ) if ( name == "spacing" )
num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); num = MetaDataBase::spacing( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) );
else if ( name == "margin" ) else if ( name == "margin" )
num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); num = MetaDataBase::margin( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) );
} }
ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl; ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl;
break; break;

2
lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
Unescape View File

@ -1121,7 +1121,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
} }
} }
} }
if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_TQOBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) ) if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( obj == TQT_BASE_OBJECT(m_pUnixIcon) ) )
{ {
// in case we clicked on the icon button // in case we clicked on the icon button
if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() ) if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() )

2
lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
Unescape View File

@ -146,7 +146,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e )
TQPoint relMousePosInChildArea = m_pParent->m_pManager->mapFromGlobal( e->globalPos() ); TQPoint relMousePosInChildArea = m_pParent->m_pManager->mapFromGlobal( e->globalPos() );
// mouse out of child area? stop child frame dragging // mouse out of child area? stop child frame dragging
if ( !TQT_TQRECT_OBJECT(m_pParent->m_pManager->rect()).contains( relMousePosInChildArea ) ) if ( !m_pParent->m_pManager->rect().contains( relMousePosInChildArea ) )
{ {
if ( relMousePosInChildArea.x() < 0 ) if ( relMousePosInChildArea.x() < 0 )
relMousePosInChildArea.rx() = 0; relMousePosInChildArea.rx() = 0;

Write Preview
Loading…
Cancel
Save