From d5688771d8a6837975be512ee37f61bad7dbd345 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 21 Dec 2023 11:50:23 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro --- tdeui/kcharselect.cpp | 2 +- tdeui/kcolordialog.cpp | 24 ++++++++++++------------ tdeui/kdatetbl.cpp | 20 ++++++++++---------- tdeui/kdockwidget.cpp | 22 +++++++++++----------- tdeui/kjanuswidget.cpp | 10 +++++----- tdeui/klineedit.cpp | 2 +- tdeui/knuminput.cpp | 2 +- tdeui/knumvalidator.cpp | 10 +++++----- tdeui/kpanelapplet.cpp | 8 ++++---- tdeui/kpixmapregionselectorwidget.cpp | 8 ++++---- tdeui/ksystemtray.cpp | 4 ++-- tdeui/ktextedit.cpp | 2 +- tdeui/kxmlguibuilder.cpp | 2 +- tdeui/qxembed.cpp | 4 ++-- tdeui/tdeaboutdialog.cpp | 12 ++++++------ tdeui/tdemainwindow.cpp | 6 +++--- tdeui/tdemainwindowiface.cpp | 2 +- tdeui/tdemessagebox.cpp | 20 ++++++++++---------- tdeui/tdetoolbar.cpp | 2 +- tdeui/twindowlistmenu.cpp | 2 +- 20 files changed, 82 insertions(+), 82 deletions(-) (limited to 'tdeui') diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp index 76ec10bf2..485c5e06e 100644 --- a/tdeui/kcharselect.cpp +++ b/tdeui/kcharselect.cpp @@ -407,7 +407,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); - TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); + TQValidator* const validator = new TQRegExpValidator( rx, this ); d->unicodeLine = new KLineEdit( bar ); d->unicodeLine->setValidator(validator); diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index d80e317af..8bfcd8084 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -1006,7 +1006,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 2); d->hedit = new KColorSpinBox( 0, 359, 1, page ); - d->hedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->hedit) ) ); + d->hedit->setValidator( new TQIntValidator( d->hedit ) ); l_lbot->addWidget(d->hedit, 0, 3); connect( d->hedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); @@ -1015,7 +1015,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 1, 2); d->sedit = new KColorSpinBox( 0, 255, 1, page ); - d->sedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->sedit) ) ); + d->sedit->setValidator( new TQIntValidator( d->sedit ) ); l_lbot->addWidget(d->sedit, 1, 3); connect( d->sedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); @@ -1024,7 +1024,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 2); d->vedit = new KColorSpinBox( 0, 255, 1, page ); - d->vedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->vedit) ) ); + d->vedit->setValidator( new TQIntValidator( d->vedit ) ); l_lbot->addWidget(d->vedit, 2, 3); connect( d->vedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); @@ -1036,7 +1036,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 4); d->redit = new KColorSpinBox( 0, 255, 1, page ); - d->redit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->redit) ) ); + d->redit->setValidator( new TQIntValidator( d->redit ) ); l_lbot->addWidget(d->redit, 0, 5); connect( d->redit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); @@ -1045,7 +1045,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget( label, 1, 4); d->gedit = new KColorSpinBox( 0, 255,1, page ); - d->gedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->gedit) ) ); + d->gedit->setValidator( new TQIntValidator( d->gedit ) ); l_lbot->addWidget(d->gedit, 1, 5); connect( d->gedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); @@ -1054,7 +1054,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 4); d->bedit = new KColorSpinBox( 0, 255, 1, page ); - d->bedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->bedit) ) ); + d->bedit->setValidator( new TQIntValidator( d->bedit ) ); l_lbot->addWidget(d->bedit, 2, 5); connect( d->bedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); @@ -1131,28 +1131,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label = new TQLabel( page ); label->setText(i18n("Name:")); - l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, TQt::AlignLeft); + l_grid->addWidget(label, 0, 1, TQt::AlignLeft); d->colorName = new TQLabel( page ); - l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, TQt::AlignLeft); + l_grid->addWidget(d->colorName, 0, 2, TQt::AlignLeft); label = new TQLabel( page ); label->setText(i18n("HTML:")); - l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, TQt::AlignLeft); + l_grid->addWidget(label, 1, 1, TQt::AlignLeft); d->htmlName = new KLineEdit( page ); d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD")); d->htmlName->setFixedWidth(w); - l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, TQt::AlignLeft); + l_grid->addWidget(d->htmlName, 1, 2, TQt::AlignLeft); connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ), TQT_SLOT( slotHtmlChanged() ) ); d->patch = new KColorPatch( page ); d->patch->setFixedSize(48, 48); - l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter); + l_grid->addMultiCellWidget(d->patch, 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter); connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), TQT_SLOT( setColor( const TQColor&))); @@ -1532,7 +1532,7 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e ) TQColor KColorDialog::grabColor(const TQPoint &p) { - TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget *desktop = TQApplication::desktop(); TQPixmap pm = TQPixmap::grabWindow( desktop->winId(), p.x(), p.y(), 1, 1); TQImage i = pm.convertToImage(); return i.pixel(0,0); diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index 6212b4e52..b0d55f246 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -84,7 +84,7 @@ public: KDateValidator::KDateValidator(TQWidget* parent, const char* name) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { } @@ -158,12 +158,12 @@ KDateTable::~KDateTable() void KDateTable::initAccels() { TDEAccel* accel = new TDEAccel(this, "date table accel"); - accel->insert(TDEStdAccel::Next, TQT_TQOBJECT(this), TQT_SLOT(nextMonth())); - accel->insert(TDEStdAccel::Prior, TQT_TQOBJECT(this), TQT_SLOT(previousMonth())); - accel->insert(TDEStdAccel::Home, TQT_TQOBJECT(this), TQT_SLOT(beginningOfMonth())); - accel->insert(TDEStdAccel::End, TQT_TQOBJECT(this), TQT_SLOT(endOfMonth())); - accel->insert(TDEStdAccel::BeginningOfLine, TQT_TQOBJECT(this), TQT_SLOT(beginningOfWeek())); - accel->insert(TDEStdAccel::EndOfLine, TQT_TQOBJECT(this), TQT_SLOT(endOfWeek())); + accel->insert(TDEStdAccel::Next, this, TQT_SLOT(nextMonth())); + accel->insert(TDEStdAccel::Prior, this, TQT_SLOT(previousMonth())); + accel->insert(TDEStdAccel::Home, this, TQT_SLOT(beginningOfMonth())); + accel->insert(TDEStdAccel::End, this, TQT_SLOT(endOfMonth())); + accel->insert(TDEStdAccel::BeginningOfLine, this, TQT_SLOT(beginningOfWeek())); + accel->insert(TDEStdAccel::EndOfLine, this, TQT_SLOT(endOfWeek())); accel->readSettings(); } @@ -609,7 +609,7 @@ void KDateTable::unsetCustomDatePainting( const TQDate &date ) KDateInternalWeekSelector::KDateInternalWeekSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0) { TQFont font; @@ -850,7 +850,7 @@ KDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) KDateInternalYearSelector::KDateInternalYearSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0) { TQFont font; @@ -1008,7 +1008,7 @@ TDEPopupFrame::exec(TQPoint pos) popup(pos); repaint(); d->exec = true; - const TQGuardedPtr that = TQT_TQOBJECT(this); + const TQGuardedPtr that = this; tqApp->enter_loop(); if ( !that ) return TQDialog::Rejected; diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index fcf960aa8..ef26821f0 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -219,7 +219,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #ifdef BORDERLESS_WINDOWS setCursor(TQCursor(ArrowCursor)); #endif - d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); + d = new KDockWidgetHeaderPrivate( this ); layout = new TQHBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); @@ -498,7 +498,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; - manager->childDock->append( TQT_TQOBJECT(this) ); + manager->childDock->append( this ); installEventFilter( manager ); eDocking = DockFullDocking; @@ -562,8 +562,8 @@ KDockWidget::~KDockWidget() } } emit iMBeingClosed(); - if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this)); - manager->childDock->remove(TQT_TQOBJECT(this)); + if (manager->d) manager->d->containerDocks.remove(this); + manager->childDock->remove(this); delete pix; delete d; // destroy private data d=0; @@ -930,7 +930,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) static_cast(((KDockSplitter*)(parent()))->getLast()); if (neighbor==this) - return (static_cast(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast(parent()->parent())->findNearestDockWidget(pos)); else if (neighbor->getWidget() && (::tqt_cast(neighbor->getWidget()))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); @@ -938,7 +938,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) return neighbor; } else - return (static_cast(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast(parent()->parent())->findNearestDockWidget(pos)); return 0; } @@ -1466,7 +1466,7 @@ void KDockWidget::setWidget( TQWidget* mw ) if (dc) { d->isContainer=true; - manager->d->containerDocks.append(TQT_TQOBJECT(this)); + manager->d->containerDocks.append(this); } else { @@ -1860,8 +1860,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; + if ( tqt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( tqt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L; if (dynamic_cast(w)) return 0L; if (!childDockWidgetList) return 0L; @@ -2512,7 +2512,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget) { if (!autoCreateDock) return; autoCreateDock->setAutoDelete(false); - autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget)); + autoCreateDock->removeRef(pDockWidget); autoCreateDock->setAutoDelete(true); } @@ -2890,7 +2890,7 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName ) if ( autoCreateDock ){ kdDebug(282)<<"Autocreating dock: "<append( TQT_TQOBJECT(autoCreate) ); + autoCreateDock->append( autoCreate ); } return autoCreate; } diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 703c8f030..685301ab8 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -254,7 +254,7 @@ TQFrame *KJanusWidget::addPage( const TQStringList &items, const TQString &heade void KJanusWidget::pageGone( TQObject *obj ) { - removePage( TQT_TQWIDGET( obj ) ); + removePage( static_cast( obj ) ); } void KJanusWidget::slotReopen( TQListViewItem * item ) @@ -435,14 +435,14 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, if( mFace == Tabbed ) { mTabControl->addTab (page, items.last()); - d->mIntToPage[d->mNextPageIndex] = static_cast(page); - d->mPageToInt[static_cast(page)] = d->mNextPageIndex; + d->mIntToPage[d->mNextPageIndex] = page; + d->mPageToInt[page] = d->mNextPageIndex; d->mNextPageIndex++; } else if( mFace == TreeList || mFace == IconList ) { - d->mIntToPage[d->mNextPageIndex] = static_cast(page); - d->mPageToInt[static_cast(page)] = d->mNextPageIndex; + d->mIntToPage[d->mNextPageIndex] = page; + d->mPageToInt[page] = d->mNextPageIndex; mPageStack->addWidget( page, 0 ); if (items.isEmpty()) { diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index 92cc5d0ca..ac3722a7a 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -1008,7 +1008,7 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) { if( o == this ) { - KCursor::autoHideEventFilter( TQT_TQOBJECT(this), ev ); + KCursor::autoHideEventFilter( this, ev ); if ( ev->type() == TQEvent::AccelOverride ) { TQKeyEvent *e = static_cast( ev ); diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index 4a16c97c6..fbbf4dd9a 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -901,7 +901,7 @@ class KDoubleSpinBoxValidator : public KDoubleValidator { public: KDoubleSpinBoxValidator( double bottom, double top, int decimals, KDoubleSpinBox* sb, const char *name ) - : KDoubleValidator( bottom, top, decimals, TQT_TQOBJECT(sb), name ), spinBox( sb ) { } + : KDoubleValidator( bottom, top, decimals, sb, name ), spinBox( sb ) { } virtual State validate( TQString& str, int& pos ) const; diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp index 6cf486ad1..62099dd32 100644 --- a/tdeui/knumvalidator.cpp +++ b/tdeui/knumvalidator.cpp @@ -35,7 +35,7 @@ // KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { _base = base; if (_base < 2) _base = 2; @@ -45,7 +45,7 @@ KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) } KIntValidator::KIntValidator ( int bottom, int top, TQWidget * parent, int base, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { _base = base; if (_base > 36) _base = 36; @@ -162,7 +162,7 @@ public: KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -170,7 +170,7 @@ KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) } KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -179,7 +179,7 @@ KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, } KFloatValidator::KFloatValidator ( double bottom, double top, bool localeAware, TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers = localeAware; diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp index 64a190d77..22ca4428c 100644 --- a/tdeui/kpanelapplet.cpp +++ b/tdeui/kpanelapplet.cpp @@ -146,15 +146,15 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch) if (watch) { - if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) == -1) + if (d->watchedForFocus.find(widget) == -1) { - d->watchedForFocus.append(TQT_TQOBJECT(widget)); + d->watchedForFocus.append(widget); widget->installEventFilter(this); } } - else if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) != -1) + else if (d->watchedForFocus.find(widget) != -1) { - d->watchedForFocus.remove(TQT_TQOBJECT(widget)); + d->watchedForFocus.remove(widget); widget->removeEventFilter(this); } } diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp index c2adb7c1f..48ee280a0 100644 --- a/tdeui/kpixmapregionselectorwidget.cpp +++ b/tdeui/kpixmapregionselectorwidget.cpp @@ -141,13 +141,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), - TQT_TQOBJECT(popup), "rotateclockwise"); + 0, this, TQT_SLOT(rotateClockwise()), + popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), - TQT_TQOBJECT(popup), "rotatecounterclockwise"); + 0, this, TQT_SLOT(rotateCounterclockwise()), + popup, "rotatecounterclockwise"); action->plug(popup); /* diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 3dd9fbaf7..7d4497d5a 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -77,12 +77,12 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) menu = new TDEPopupMenu( this ); menu->insertTitle( kapp->miniIcon(), kapp->caption() ); move( -1000, -1000 ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection); + KStdAction::quit(this, TQT_SLOT(maybeQuit()), d->actionCollection); if (parentWidget()) { new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), + this, TQT_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); #ifdef Q_WS_X11 KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() ); diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index e0208be82..ac0b567e8 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -351,7 +351,7 @@ void KTextEdit::checkSpelling() { delete d->spell; d->spell = new KSpell( this, i18n( "Spell Checking" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); connect( d->spell, TQT_SIGNAL( death() ), this, TQT_SLOT( spellCheckerFinished() ) ); diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp index 5774be8c0..c3dd1c233 100644 --- a/tdeui/kxmlguibuilder.cpp +++ b/tdeui/kxmlguibuilder.cpp @@ -205,7 +205,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ TQCString name = element.attribute( d->attrName ).utf8(); - TDEToolBar *bar = static_cast(TQT_TQWIDGET(d->m_widget->child( name, "TDEToolBar" ))); + TDEToolBar *bar = static_cast(d->m_widget->child( name, "TDEToolBar" )); if( !bar ) { bar = new TDEToolBar( d->m_widget, name, honor, false ); diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp index 2429737ab..d1c3b004e 100644 --- a/tdeui/qxembed.cpp +++ b/tdeui/qxembed.cpp @@ -421,7 +421,7 @@ static int qxembed_x11_event_filter( XEvent* e) // L0671: Keep Qt message time up to date if ( msgtime > get_tqt_x_time() ) set_tqt_x_time(msgtime); - TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); + TQWidget* w = TQWidget::find( e->xclient.window ); if ( !w ) break; switch ( message) { @@ -525,7 +525,7 @@ static int qxembed_x11_event_filter( XEvent* e) } } else if ( e->xclient.format == 32 && e->xclient.message_type ) { if ( e->xclient.message_type == tqt_wm_protocols ) { - TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); + TQWidget* w = TQWidget::find( e->xclient.window ); if ( !w ) break; // L0690: This is for the embedding side! diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp index 9f6bf24b2..b2b09e6a2 100644 --- a/tdeui/tdeaboutdialog.cpp +++ b/tdeui/tdeaboutdialog.cpp @@ -227,8 +227,8 @@ void TDEAboutContributor::updateLayout( void ) { if( mShowHeader ) { - gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQt::AlignmentFlags)AlignLeft ); - gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft ); + gbox->addWidget( mLabel[i], r, 0, (TQt::AlignmentFlags)AlignLeft ); + gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft ); mLabel[i]->show(); mText[i]->show(); } @@ -237,11 +237,11 @@ void TDEAboutContributor::updateLayout( void ) mLabel[i]->hide(); if( !i ) { - gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft ); + gbox->addMultiCellWidget( mText[i], r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft ); } else { - gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQt::AlignmentFlags)AlignLeft ); + gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft ); } mText[i]->show(); } @@ -800,7 +800,7 @@ void TDEAboutContainer::childEvent( TQChildEvent *e ) ++itr; if( o->isWidgetType() ) { - TQT_TQWIDGET(o)->setMinimumWidth( s.width() ); + static_cast(o)->setMinimumWidth( s.width() ); } } } @@ -826,7 +826,7 @@ TQSize TDEAboutContainer::sizeHint( void ) const if( o->isWidgetType() ) { ++numChild; - TQWidget* const w= TQT_TQWIDGET(o); + TQWidget* const w= static_cast(o); TQSize s = w->minimumSize(); if( s.isEmpty() ) diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp index 052382851..9905d2991 100644 --- a/tdeui/tdemainwindow.cpp +++ b/tdeui/tdemainwindow.cpp @@ -433,7 +433,7 @@ bool TDEMainWindow::restore( int number, bool show ) KXMLGUIFactory *TDEMainWindow::guiFactory() { if ( !factory_ ) - factory_ = new KXMLGUIFactory( this, TQT_TQOBJECT(this), "guifactory" ); + factory_ = new KXMLGUIFactory( this, this, "guifactory" ); return factory_; } @@ -467,7 +467,7 @@ void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & if( options & ToolBar ){ setStandardToolBarMenuEnabled( true ); - KStdAction::configureToolbars(TQT_TQOBJECT(this), + KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars() ), actionCollection()); } @@ -804,7 +804,7 @@ bool TDEMainWindow::isStandardToolBarMenuEnabled() const void TDEMainWindow::createStandardStatusBarAction(){ if(!d->showStatusBarAction){ - d->showStatusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(setSettingsDirty()), actionCollection()); + d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection()); KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already. connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool))); d->showStatusBarAction->setChecked(sb->isHidden()); diff --git a/tdeui/tdemainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp index 0404249b0..a18fb80ed 100644 --- a/tdeui/tdemainwindowiface.cpp +++ b/tdeui/tdemainwindowiface.cpp @@ -34,7 +34,7 @@ TDEMainWindowInterface::TDEMainWindowInterface(TDEMainWindow * mainWindow) { m_MainWindow = mainWindow; m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this ); - m_dcopPropertyProxy = new KDCOPPropertyProxy(TQT_TQOBJECT(m_MainWindow)); + m_dcopPropertyProxy = new KDCOPPropertyProxy(m_MainWindow); } TDEMainWindowInterface::~TDEMainWindowInterface() diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp index f4fbc84bb..728540ede 100644 --- a/tdeui/tdemessagebox.cpp +++ b/tdeui/tdemessagebox.cpp @@ -423,7 +423,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No, @@ -474,7 +474,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -556,7 +556,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -628,7 +628,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownContinue(dontAskAgainName) ) return Continue; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -704,7 +704,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -755,7 +755,7 @@ void KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringList &strlist, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes, @@ -785,7 +785,7 @@ KMessageBox::detailedErrorWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -832,7 +832,7 @@ void KMessageBox::sorryWId(WId parent_id, const TQString &text, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes, @@ -862,7 +862,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -908,7 +908,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri if ( !shouldBeShownContinue(dontShowAgainName) ) return; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Information") : caption, KDialogBase::Yes, diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index 651e789a9..73d9ec2b8 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -1350,7 +1350,7 @@ TQSize TDEToolBar::sizeHint() const ncThis->polish(); - int margin = static_cast(ncThis)->layout()->margin() + frameWidth(); + int margin = ncThis->layout()->margin() + frameWidth(); switch( barPos() ) { case TDEToolBar::Top: diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp index bc2df2f66..8e07dde71 100644 --- a/tdeui/twindowlistmenu.cpp +++ b/tdeui/twindowlistmenu.cpp @@ -85,7 +85,7 @@ int NameSortedInfoList::compareItems( TQPtrCollection::Item s1, TQPtrCollection: KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name) : TDEPopupMenu(parent, name) { - twin_module = new KWinModule(TQT_TQOBJECT(this)); + twin_module = new KWinModule(this); connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); } -- cgit v1.2.1