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

Drop TQT_BASE_OBJECT* defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 0fc56f21d4)
pull/478/head
Michele Calgaro 1 year ago
parent 7c193f33d7
commit 5cfda35559
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
24 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
kate/app/katefileselector.cpp
Unescape View File

@ -485,7 +485,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e )
And the popup is rather useless, if the paths are only partly visible.
*/
TQListBox *lb = cmbPath->listBox();
if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) {
if ( o == lb && e->type() == TQEvent::Show ) {
int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
int w = TQMIN( mainwin->width(), lb->contentsWidth() + add );
lb->resize( w, lb->height() );

2
kicker/applets/clock/clock.cpp
Unescape View File

@ -1675,7 +1675,7 @@ void ClockApplet::wheelEvent(TQWheelEvent* e)
// catch the mouse clicks of our child widgets
bool ClockApplet::eventFilter( TQObject *o, TQEvent *e )
{
if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) &&
if (( o == _clock->widget() || o == _date || o == _dayOfWeek) &&
e->type() == TQEvent::MouseButtonPress )
{
mousePressEvent(TQT_TQMOUSEEVENT(e) );

4
kicker/applets/lockout/lockout.cpp
Unescape View File

@ -196,7 +196,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
TQMouseEvent *me = TQT_TQMOUSEEVENT( e );
if( me->button() == Qt::RightButton )
{
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lockButton) )
if( o == lockButton )
{
TQPopupMenu *popup = new TQPopupMenu();
@ -219,7 +219,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
return true;
}
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(logoutButton) )
else if ( o == logoutButton )
{
TQPopupMenu *popup = new TQPopupMenu();

2
kicker/applets/minipager/pagerbutton.cpp
Unescape View File

@ -747,7 +747,7 @@ void KMiniPagerButton::slotToggled( bool b )
bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e)
{
if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) &&
if (o && o == m_lineEdit &&
(e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide))
{
m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() );

2
kicker/applets/systemtray/systemtrayapplet.cpp
Unescape View File

@ -833,7 +833,7 @@ int SystemTrayApplet::maxIconHeight() const
bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
{
if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_expandButton))
if (watched == m_expandButton)
{
TQPoint p;
if (e->type() == TQEvent::ContextMenu)

2
kicker/kicker/core/applethandle.cpp
Unescape View File

@ -220,7 +220,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
return TQWidget::eventFilter( o, e );
}
else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar))
else if (o == m_dragBar)
{
if (e->type() == TQEvent::MouseButtonPress)
{

2
kicker/kicker/core/container_button.cpp
Unescape View File

@ -225,7 +225,7 @@ void ButtonContainer::dragButton(const TQPixmap icon)
bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
{
if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress)
if (o == _button && e->type() == TQEvent::MouseButtonPress)
{
static bool sentinal = false;

4
kicker/kicker/core/containerarea.cpp
Unescape View File

@ -1201,7 +1201,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
}
TQObject *parent = ev->source() ? ev->source()->parent() : 0;
while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this)))
while (parent && (parent != this))
{
parent = parent->parent();
}
@ -1387,7 +1387,7 @@ bool ContainerArea::eventFilter(TQObject* o, TQEvent* e)
// which contain a ContainerArea can react to layout changes of its
// contents. For example: If an applets grows, the top level widget may
// want to grow as well.
if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_contents))
if (o == m_contents)
{
if (e->type() == TQEvent::LayoutHint)
{

16
kicker/kicker/ui/k_new_mnu.cpp
Unescape View File

@ -489,7 +489,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
}
while (receiver) {
if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p));
if (s && s->identifier() == ApplicationsTab)
raiseWidget = m_browserView;
@ -509,8 +509,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
/* we do not want hover activation for the search line edit as this can be
* pretty disturbing */
if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) ||
( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) &&
if ( (receiver == m_searchPixmap ||
( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) &&
( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel
|| e->type() == TQEvent::MouseButtonPress ) ) ) &&
!m_isShowing) {
@ -666,7 +666,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
r = true;
}
if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker))
if (e->type() == TQEvent::Enter && receiver == m_stacker)
{
TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size());
r.setSize(r.size()+TQSize(16,128));
@ -2800,7 +2800,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title());
if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView))
if (source==m_favoriteView)
{
hasEntries = true;
m_popupMenu->insertItem(SmallIconSet("remove"),
@ -2832,7 +2832,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
}
}
if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) {
if (source!=m_exitView) {
if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) {
if (hasEntries)
m_popupMenu->insertSeparator();
@ -2872,7 +2872,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
i18n("Put Into Run Dialog"), PutIntoRunDialog);
}
}
if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
TQString uri;
if (m_popupService)
uri = locate("apps", m_popupService->desktopEntryPath());
@ -2909,7 +2909,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
}
}
if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) {
if (source==m_recentlyView) {
m_popupMenu->insertSeparator();
if (m_popupService)
m_popupMenu->insertItem(SmallIconSet("history_clear"),

2
kicker/libkicker/panner.cpp
Unescape View File

@ -336,7 +336,7 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin )
bool Panner::eventFilter( TQObject *obj, TQEvent *e )
{
if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_viewport) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_clipper) )
if ( obj == _viewport || obj == _clipper )
{
switch ( e->type() )
{

2
konqueror/konq_combo.cpp
Unescape View File

@ -396,7 +396,7 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev )
// Handle Ctrl+Del/Backspace etc better than the Qt widget, which always
// jumps to the next whitespace.
TQLineEdit *edit = lineEdit();
if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) {
if ( o == edit ) {
int type = ev->type();
if ( type == TQEvent::KeyPress ) {
TQKeyEvent *e = TQT_TQKEYEVENT( ev );

4
konqueror/konq_frame.cpp
Unescape View File

@ -173,7 +173,7 @@ void KonqFrameStatusBar::splitFrameMenu()
bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e)
{
if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pStatusLabel) && e->type()==TQEvent::MouseButtonPress)
if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress)
{
emit clicked();
update();
@ -181,7 +181,7 @@ bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e)
splitFrameMenu();
return true;
}
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::ApplicationPaletteChange )
else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange )
{
unsetPalette();
updateActiveStatus();

2
konqueror/konq_mainwindow.cpp
Unescape View File

@ -3462,7 +3462,7 @@ void KonqMainWindow::slotClearComboHistory()
bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
{
if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) &&
m_combo && TQT_BASE_OBJECT(m_combo->lineEdit()) == TQT_BASE_OBJECT(obj) )
m_combo && m_combo->lineEdit() == obj )
{
//kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl;

4
konqueror/konq_view.cpp
Unescape View File

@ -1256,7 +1256,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
if ( !m_pPart )
return false;
// kdDebug() << "--" << obj->className() << "--" << e->type() << "--" << endl;
if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) )
if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() )
{
TQDragEnterEvent *ev = static_cast<TQDragEnterEvent *>( e );
@ -1277,7 +1277,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
delete children;
}
}
else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) )
else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() )
{
TQDropEvent *ev = static_cast<TQDropEvent *>( e );

2
konsole/konsole/TEWidget.cpp
Unescape View File

@ -1938,7 +1938,7 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
TQT_TQKEYEVENT( e )->ignore();
return false;
}
if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(parent()) /* when standalone */ )
if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
return false; // not us
if ( e->type() == TQEvent::KeyPress )
{

2
konsole/konsole/konsole.cpp
Unescape View File

@ -984,7 +984,7 @@ void Konsole::makeTabWidget()
bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
{
if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_newSessionButton))
if (o == m_newSessionButton)
{
// Popup the menu when the left mousebutton is pressed and the mouse
// is moved by a small distance.

2
ksplashml/wndmain.cpp
Unescape View File

@ -427,7 +427,7 @@ TQPtrList<Action> KSplash::actionList()
bool KSplash::eventFilter( TQObject *o, TQEvent *e )
{
if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mThemeEngine) ) )
if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
{
TQTimer::singleShot( 0, this, TQT_SLOT(close()));
return TRUE;

2
twin/clients/b2/b2client.cpp
Unescape View File

@ -1179,7 +1179,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
bool B2Client::eventFilter(TQObject *o, TQEvent *e)
{
if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()))
if (o != widget())
return false;
switch (e->type()) {
case TQEvent::Resize:

2
twin/clients/keramik/keramik.cpp
Unescape View File

@ -1796,7 +1796,7 @@ TQSize KeramikClient::minimumSize() const
bool KeramikClient::eventFilter( TQObject* o, TQEvent* e )
{
if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) )
if ( o != widget() )
return false;
switch ( e->type() )

2
twin/clients/test/test.cpp
Unescape View File

@ -100,7 +100,7 @@ TQSize Decoration::minimumSize() const
bool Decoration::eventFilter( TQObject* o, TQEvent* e )
{
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(widget()))
if( o == widget())
{
switch( e->type())
{

4
twin/events.cpp
Unescape View File

@ -1079,7 +1079,7 @@ int qtToX11State( TQt::ButtonState state )
// for the decoration window cannot be (easily) intercepted as X11 events
bool Client::eventFilter( TQObject* o, TQEvent* e )
{
if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(shadowWidget))
if (o == shadowWidget)
{
if (e->type() == TQEvent::MouseButtonRelease)
{
@ -1291,7 +1291,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e )
}
}
if( decoration == NULL
|| TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(decoration->widget()))
|| o != decoration->widget())
return false;
if( e->type() == TQEvent::MouseButtonPress )
{

2
twin/geometry.cpp
Unescape View File

@ -2288,7 +2288,7 @@ class EatAllPaintEvents
{
protected:
virtual bool eventFilter( TQObject* o, TQEvent* e )
{ return e->type() == TQEvent::Paint && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(geometryTip); }
{ return e->type() == TQEvent::Paint && o != geometryTip; }
};
static EatAllPaintEvents* eater = 0;

2
twin/kcmtwin/twinrules/detectwidget.cpp
Unescape View File

@ -170,7 +170,7 @@ void DetectDialog::selectWindow()
bool DetectDialog::eventFilter( TQObject* o, TQEvent* e )
{
if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(grabber) )
if( o != grabber )
return false;
if( e->type() != TQEvent::MouseButtonRelease )
return false;

2
twin/lib/kcommondecoration.cpp
Unescape View File

@ -844,7 +844,7 @@ void KCommonDecoration::updateWindowShape()
bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e )
{
if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()))
if( o != widget())
return false;
switch( e->type())
{

Write Preview
Loading…
Cancel
Save