summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/kofficecore/KoDetailsPane.cpp8
-rw-r--r--lib/kofficecore/KoFrame.cpp4
-rw-r--r--lib/kofficecore/KoMainWindow.cpp4
-rw-r--r--lib/kofficecore/kkbdaccessextensions.cpp2
-rw-r--r--lib/kofficeui/KoPartSelectAction.cpp2
-rw-r--r--lib/kofficeui/KoTooluButton.cpp2
-rw-r--r--lib/kofficeui/ttdetoolbarbutton.cpp4
-rw-r--r--lib/kopalette/kopalettemanager.cpp2
-rw-r--r--lib/koproperty/editor.cpp2
-rw-r--r--lib/koproperty/editors/pixmapedit.cpp2
-rw-r--r--lib/koproperty/editors/spinbox.cpp8
11 files changed, 20 insertions, 20 deletions
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 0d218532..03a70b5b 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -226,13 +226,13 @@ void KoTemplatesPane::changeAlwaysUseTemplate(KoTemplatesPane* sender, const TQS
bool KoTemplatesPane::eventFilter(TQObject* watched, TQEvent* e)
{
- if(TQT_BASE_OBJECT(watched) == m_previewLabel) {
+ if(watched == m_previewLabel) {
if(e->type() == TQEvent::MouseButtonDblClick) {
openTemplate();
}
}
- if(TQT_BASE_OBJECT(watched) == m_documentList) {
+ if(watched == m_documentList) {
if((e->type() == TQEvent::Resize) && isShown()) {
emit splitterResized(this, m_splitter->sizes());
}
@@ -444,13 +444,13 @@ void KoRecentDocumentsPane::changePalette()
bool KoRecentDocumentsPane::eventFilter(TQObject* watched, TQEvent* e)
{
- if(TQT_BASE_OBJECT(watched) == m_previewLabel) {
+ if(watched == m_previewLabel) {
if(e->type() == TQEvent::MouseButtonDblClick) {
openFile();
}
}
- if(TQT_BASE_OBJECT(watched) == m_documentList) {
+ if(watched == m_documentList) {
if((e->type() == TQEvent::Resize) && isShown()) {
emit splitterResized(this, m_splitter->sizes());
}
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index b1262ce5..114996c3 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -362,7 +362,7 @@ void KoFrame::resizeEvent( TQResizeEvent* )
bool KoFrame::eventFilter( TQObject* obj, TQEvent* ev )
{
- if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->m_view) && KParts::PartActivateEvent::test( ev ) )
+ if ( obj == d->m_view && KParts::PartActivateEvent::test( ev ) )
{
kdDebug(30003) << "Activate event"<< endl;
KParts::PartActivateEvent* e = (KParts::PartActivateEvent*)ev;
@@ -374,7 +374,7 @@ bool KoFrame::eventFilter( TQObject* obj, TQEvent* ev )
setState( Inactive );
}
}
- else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->m_view) && KParts::PartSelectEvent::test( ev ) )
+ else if ( obj == d->m_view && KParts::PartSelectEvent::test( ev ) )
{
kdDebug(30003) << "Selected event" << endl;
KParts::PartSelectEvent* e = (KParts::PartSelectEvent*)ev;
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 2dd15e95..36d5fbdc 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -1315,7 +1315,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle )
{
//kdDebug(30003) << "KoMainWindow::slotToolbarToggled " << sender()->name() << " toggle=" << true << endl;
// The action (sender) and the toolbar have the same name
- TDEToolBar * bar = toolBar( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() );
+ TDEToolBar * bar = toolBar( sender()->name() );
if (bar)
{
if (toggle)
@@ -1327,7 +1327,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle )
saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
}
else
- kdWarning(30003) << "slotToolbarToggled : Toolbar " << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() << " not found!" << endl;
+ kdWarning(30003) << "slotToolbarToggled : Toolbar " << sender()->name() << " not found!" << endl;
}
bool KoMainWindow::toolbarIsVisible(const char *tbName)
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 0e216098..cfdfc46d 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -265,7 +265,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e )
showIcon();
return true;
}
- else if (e->type() == TQEvent::Resize && d->panel && TQT_BASE_OBJECT(o) == d->panel) {
+ else if (e->type() == TQEvent::Resize && d->panel && o == d->panel) {
// TODO: This doesn't always work.
showIcon();
}
diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp
index 2077b31d..e5aaf73c 100644
--- a/lib/kofficeui/KoPartSelectAction.cpp
+++ b/lib/kofficeui/KoPartSelectAction.cpp
@@ -64,7 +64,7 @@ void KoPartSelectAction::init()
// Called when selecting a part
void KoPartSelectAction::slotActionActivated()
{
- TQString servName = TQString::fromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() );
+ TQString servName = TQString::fromLatin1( sender()->name() );
KService::Ptr serv = KService::serviceByName( servName );
m_documentEntry = KoDocumentEntry( serv );
emit activated();
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 0d24cd16..4ede56d9 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -809,7 +809,7 @@ void KoToolButton::drawButton(TQPainter *_painter)
bool KoToolButton::eventFilter( TQObject* o, TQEvent* e )
{
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_popup) ) {
+ if ( o == m_popup ) {
if ( e->type() == TQEvent::MouseButtonPress )
if ( hitArrow( mapFromGlobal( TQT_TQMOUSEEVENT( e )->globalPos() ) ) ) {
kdDebug() << "KoToolButton::eventFilter-------------->" << endl;
diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp
index 6fed1f48..6aaab739 100644
--- a/lib/kofficeui/ttdetoolbarbutton.cpp
+++ b/lib/kofficeui/ttdetoolbarbutton.cpp
@@ -314,7 +314,7 @@ void TTDEToolBarButton::enterEvent(TQEvent *)
bool TTDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
{
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) )
+ if ( o == this )
if (ev->type() == TQEvent::MouseButtonPress && d->m_popup && d->m_isPopup ) {
if (!d->m_isToggle) {
d->m_arrowPressed = arrowPressed( mapFromGlobal(TQCursor::pos()) );
@@ -323,7 +323,7 @@ bool TTDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
}
}
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_popup)) {
+ if ( o == d->m_popup) {
switch (ev->type())
{
case TQEvent::Show:
diff --git a/lib/kopalette/kopalettemanager.cpp b/lib/kopalette/kopalettemanager.cpp
index 26f30992..48dc682d 100644
--- a/lib/kopalette/kopalettemanager.cpp
+++ b/lib/kopalette/kopalettemanager.cpp
@@ -497,7 +497,7 @@ void KoPaletteManager::showAllPalettes(bool shown)
bool KoPaletteManager::eventFilter( TQObject *o, TQEvent *e )
{
- if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_view)) return false;
+ if (o != m_view) return false;
if(e && e->type() == (TQEvent::User + 42)) {
KParts::PartActivateEvent * pae = dynamic_cast<KParts::PartActivateEvent *>(e);
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index d4c61ec2..2dc05f48 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -915,7 +915,7 @@ Editor::resizeEvent(TQResizeEvent *ev)
bool
Editor::eventFilter( TQObject * watched, TQEvent * e )
{
- if ((TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(viewport())) && e->type()==TQEvent::KeyPress) {
+ if ((watched==this || watched==viewport()) && e->type()==TQEvent::KeyPress) {
if (handleKeyPress(TQT_TQKEYEVENT(e)))
return true;
}
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index cf7645bf..4e295c96 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -205,7 +205,7 @@ PixmapEdit::resizeEvent(TQResizeEvent *e)
bool
PixmapEdit::eventFilter(TQObject *o, TQEvent *ev)
{
- if(TQT_BASE_OBJECT(o) == m_edit) {
+ if(o == m_edit) {
if(ev->type() == TQEvent::MouseButtonPress && TQT_TQMOUSEEVENT(ev)->button()==Qt::LeftButton) {
if(m_previewPixmap.height() <= m_edit->height()
&& m_previewPixmap.width() <= m_edit->width())
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index 4d9266a8..e76ca930 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -59,7 +59,7 @@ void IntSpinBox::setValue(const TQVariant &value)
bool
IntSpinBox::eventFilter(TQObject *o, TQEvent *e)
{
- if(TQT_BASE_OBJECT(o) == editor())
+ if(o == editor())
{
if(e->type() == TQEvent::KeyPress)
{
@@ -71,7 +71,7 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e)
}
}
}
- if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this))
+ if ((o == editor() || o == this || o->parent() == this)
&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
{
return true; //avoid value changes for read-only widget
@@ -192,7 +192,7 @@ DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double va
bool
DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e)
{
- if(TQT_BASE_OBJECT(o) == editor())
+ if(o == editor())
{
if(e->type() == TQEvent::KeyPress)
{
@@ -204,7 +204,7 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e)
}
}
}
- if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this))
+ if ((o == editor() || o == this || o->parent() == this)
&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
{
return true; //avoid value changes for read-only widget