summaryrefslogtreecommitdiffstats
path: root/tdeui
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-18 16:44:23 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-20 13:29:51 +0900
commit0e4a5c95a4675da94170d7c8997bf14f76451e31 (patch)
treed275a38208f309ad1270af8c6f782f0ad7fa5b7c /tdeui
parent303b6445011a6ed10c48ac6e1eda415e5c371264 (diff)
downloadtdelibs-0e4a5c95a4675da94170d7c8997bf14f76451e31.tar.gz
tdelibs-0e4a5c95a4675da94170d7c8997bf14f76451e31.zip
Replace various strings '#define'd in tqtinterface
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 57e0ed66347db15cb1cd66488f095107e7772ad9)
Diffstat (limited to 'tdeui')
-rw-r--r--tdeui/kcombobox.cpp2
-rw-r--r--tdeui/kcursor.cpp2
-rw-r--r--tdeui/kdockwidget.cpp44
-rw-r--r--tdeui/kdockwidget_private.cpp16
-rw-r--r--tdeui/keditlistbox.cpp2
-rw-r--r--tdeui/kpixmapio.cpp10
-rw-r--r--tdeui/kxmlguifactory.cpp2
-rw-r--r--tdeui/qxembed.cpp4
-rw-r--r--tdeui/tdeaction.cpp14
-rw-r--r--tdeui/tdeactionclasses.cpp2
-rw-r--r--tdeui/tdeactioncollection.cpp2
-rw-r--r--tdeui/tdelistviewsearchline.cpp2
-rw-r--r--tdeui/tdetoolbar.cpp38
-rw-r--r--tdeui/tdetoolbarbutton.cpp4
-rw-r--r--tdeui/tdetoolbarhandler.cpp4
15 files changed, 74 insertions, 74 deletions
diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index 66146bad3..466015adc 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -261,7 +261,7 @@ void KComboBox::setLineEdit( TQLineEdit *edit )
}
TQComboBox::setLineEdit( edit );
- d->klineEdit = tqt_dynamic_cast<KLineEdit*>( edit );
+ d->klineEdit = dynamic_cast<KLineEdit*>( edit );
setDelegate( d->klineEdit );
// Connect the returnPressed signal for both Q[K]LineEdits'
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp
index 31bbc2f2e..43390d6a2 100644
--- a/tdeui/kcursor.cpp
+++ b/tdeui/kcursor.cpp
@@ -308,7 +308,7 @@ TQWidget* KCursorPrivateAutoHideEventFilter::actualWidget() const
TQWidget* w = m_widget;
// Is w a scrollview ? Call setCursor on the viewport in that case.
- TQScrollView * sv = tqt_dynamic_cast<TQScrollView *>( w );
+ TQScrollView * sv = dynamic_cast<TQScrollView *>( w );
if ( sv )
w = sv->viewport();
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index 36f482f64..6e9fa0559 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -535,7 +535,7 @@ void KDockWidget::setPixmap(const TQPixmap& pixmap) {
dtg->changeTab(this,pixmap,dtg->tabLabel(this));
TQWidget *contWid=parentDockContainer();
if (contWid) {
- KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(contWid);
+ KDockContainer *x = dynamic_cast<KDockContainer*>(contWid);
if (x) {
x->setPixmap(this,pixmap);
}
@@ -556,7 +556,7 @@ KDockWidget::~KDockWidget()
}
if (latestKDockContainer()) {
- KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(latestKDockContainer());
+ KDockContainer *x = dynamic_cast<KDockContainer*>(latestKDockContainer());
if (x) {
x->removeWidget(this);
}
@@ -719,7 +719,7 @@ void KDockWidget::setLatestKDockContainer(TQWidget* container)
{
if (container)
{
- if (tqt_dynamic_cast<KDockContainer*>(container))
+ if (dynamic_cast<KDockContainer*>(container))
d->container=container;
else
d->container=0;
@@ -729,7 +729,7 @@ void KDockWidget::setLatestKDockContainer(TQWidget* container)
TQWidget* KDockWidget::latestKDockContainer()
{
if (!(d->container)) return 0;
- if (tqt_dynamic_cast<KDockContainer*>(d->container.operator->())) return d->container;
+ if (dynamic_cast<KDockContainer*>(d->container.operator->())) return d->container;
return 0;
}
@@ -782,7 +782,7 @@ void KDockWidget::updateHeader()
header->hide();
} else {
header->setTopLevel( false );
- if (widget && tqt_dynamic_cast<KDockContainer*>(widget))
+ if (widget && dynamic_cast<KDockContainer*>(widget))
header->hide();
else
header->show();
@@ -999,7 +999,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
* dock tab group, and our parent isn't a KDockContainer, and we have no explicit
* parent dock container...we can't do much yet */
if ( parent() && !parent()->inherits("KDockSplitter") && !parentDockTabGroup() &&
- !(tqt_dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){
+ !(dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){
// kdDebug(282)<<"KDockWidget::manualDock(): success = false (3)"<<endl;
// kdDebug(282)<<parent()->name()<<endl;
success = false;
@@ -1064,11 +1064,11 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
if (!contWid) contWid=target->widget;
if (contWid)
{
- KDockContainer *cont=tqt_dynamic_cast<KDockContainer*>(contWid);
+ KDockContainer *cont=dynamic_cast<KDockContainer*>(contWid);
if (cont)
{
if (latestKDockContainer() && (latestKDockContainer()!=contWid)) {
- KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(latestKDockContainer());
+ KDockContainer* dc = dynamic_cast<KDockContainer*>(latestKDockContainer());
if (dc) {
dc->removeWidget(this);
}
@@ -1227,7 +1227,7 @@ TQWidget *KDockWidget::parentDockContainer() const
{
if (!parent()) return 0L;
TQWidget* candidate = parentWidget()->parentWidget();
- if (candidate && tqt_dynamic_cast<KDockContainer*>(candidate)) return candidate;
+ if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate;
return 0L;
}
@@ -1382,7 +1382,7 @@ void KDockWidget::undock()
{
// kdDebug(282)<<"undocked from dockcontainer"<<endl;
undockedFromContainer=true;
- KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(d->container.operator->());
+ KDockContainer* dc = dynamic_cast<KDockContainer*>(d->container.operator->());
if (dc) {
dc->undockWidget(this);
setFormerBrotherDockWidget(dc->parentDockWidget());
@@ -1462,7 +1462,7 @@ void KDockWidget::setWidget( TQWidget* mw )
layout = new TQVBoxLayout( this );
layout->setResizeMode( TQLayout::Minimum );
- KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(widget);
+ KDockContainer* dc = dynamic_cast<KDockContainer*>(widget);
if (dc)
{
d->isContainer=true;
@@ -1538,7 +1538,7 @@ void KDockWidget::makeDockVisible()
}
if (parentDockContainer()) {
TQWidget *contWid=parentDockContainer();
- KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(contWid);
+ KDockContainer *x = dynamic_cast<KDockContainer*>(contWid);
if (x) {
x->showWidget(this);
}
@@ -1862,7 +1862,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
}
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_dynamic_cast<KDockContainer*>(w)) return 0L;
+ if (dynamic_cast<KDockContainer*>(w)) return 0L;
if (!childDockWidgetList) return 0L;
if ( childDockWidgetList->find(w) != -1 ) return 0L;
@@ -2221,7 +2221,7 @@ void KDockManager::writeConfig(TQDomElement &base)
for (TQObjectListIt it(d->containerDocks);it.current();++it)
{
- KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
+ KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
if (dc) {
dc->prepareSave(nList);
}
@@ -2241,7 +2241,7 @@ void KDockManager::writeConfig(TQDomElement &base)
TQDomElement groupEl;
if (obj->d->isContainer) {
- KDockContainer* x = tqt_dynamic_cast<KDockContainer*>(obj->widget);
+ KDockContainer* x = dynamic_cast<KDockContainer*>(obj->widget);
if (x) {
groupEl=doc.createElement("dockContainer");
x->save(groupEl);
@@ -2379,7 +2379,7 @@ void KDockManager::readConfig(TQDomElement &base)
if (!(cont->d->isContainer)) {
kdDebug(282)<<"restoration of dockContainer is only supported for already existing dock containers"<<endl;
} else {
- KDockContainer *dc=tqt_dynamic_cast<KDockContainer*>(cont->getWidget());
+ KDockContainer *dc=dynamic_cast<KDockContainer*>(cont->getWidget());
if (!dc) kdDebug(282)<<"Error while trying to handle dockcontainer configuration restoration"<<endl;
else {
dc->load(childEl);
@@ -2555,7 +2555,7 @@ void KDockManager::writeConfig( TDEConfig* c, TQString group )
// kdDebug(282)<<TQString("list size: %1").arg(nList.count())<<endl;
for (TQObjectListIt it(d->containerDocks);it.current();++it)
{
- KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
+ KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
if (dc) {
dc->prepareSave(nList);
}
@@ -2571,7 +2571,7 @@ void KDockManager::writeConfig( TDEConfig* c, TQString group )
obj->header->saveConfig( c );
}
if (obj->d->isContainer) {
- KDockContainer* x = tqt_dynamic_cast<KDockContainer*>(obj->widget);
+ KDockContainer* x = dynamic_cast<KDockContainer*>(obj->widget);
if (x) {
x->save(c,group);
}
@@ -2734,7 +2734,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group )
}
if (obj && obj->d->isContainer) {
- tqt_dynamic_cast<KDockContainer*>(obj->widget)->load(c,group);
+ dynamic_cast<KDockContainer*>(obj->widget)->load(c,group);
removeFromAutoCreateList(obj);
}
if ( obj && obj->header){
@@ -2774,7 +2774,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group )
KDockWidget* d2 = getDockWidgetFromName( list.current() );
tabDockGroup = d2->manualDock( d1, KDockWidget::DockCenter );
if ( tabDockGroup ){
- KDockTabGroup* tab = tqt_dynamic_cast<KDockTabGroup*>(tabDockGroup->widget);
+ KDockTabGroup* tab = dynamic_cast<KDockTabGroup*>(tabDockGroup->widget);
list.next();
while ( list.current() && tabDockGroup ){
KDockWidget* tabDock = getDockWidgetFromName( list.current() );
@@ -2791,7 +2791,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group )
obj = tabDockGroup;
}
- if (obj && obj->d->isContainer) tqt_dynamic_cast<KDockContainer*>(obj->widget)->load(c,group);
+ if (obj && obj->d->isContainer) dynamic_cast<KDockContainer*>(obj->widget)->load(c,group);
if ( obj && obj->header){
obj->header->loadConfig( c );
}
@@ -3123,7 +3123,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
// TQPtrList<TQObject> list(children());
// TQObject *obj=((TQPtrList<TQObject*>)children())->at(i);
TQObject *obj=children()->getFirst();
- if (split = tqt_dynamic_cast<KDockSplitter*>(obj))
+ if (split = dynamic_cast<KDockSplitter*>(obj))
{
split->setGeometry( TQRect(TQPoint(0,0), size() ));
// break;
diff --git a/tdeui/kdockwidget_private.cpp b/tdeui/kdockwidget_private.cpp
index 3b00fbb1a..0741129ff 100644
--- a/tdeui/kdockwidget_private.cpp
+++ b/tdeui/kdockwidget_private.cpp
@@ -274,7 +274,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
// However, this works surprising well!
if (m_orientation == TQt::Horizontal) {
if (ev->oldSize().height() != ev->size().height()) {
- if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
+ if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) {
// dockwidget is on the bottom. move xpos so that the size from child1 stays
xpos = (int)ceil(((double)factor) * checkValue(height() - child1->height() - 4) / height());
} else {
@@ -286,7 +286,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
}
} else {
if (ev->oldSize().width() != width()) {
- if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
+ if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) {
xpos = (int)ceil(((double)factor) * checkValue(width() - child1->width() - 4) / width());
} else {
// xpos should not change
@@ -332,11 +332,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
kdDebug(282) << "Splitter visibility : " << divider->isVisible() << endl;;
kdDebug(282) << "Splitter procentual pos: " << xpos << endl;
if (c0->getWidget()) {
- dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget());
+ dc=dynamic_cast<KDockContainer*>(c0->getWidget());
kdDebug(282) << "Child 0 KDockContainer?: " << dc << endl;
}
if (c1->getWidget()) {
- dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget());
+ dc=dynamic_cast<KDockContainer*>(c1->getWidget());
kdDebug(282) << "Child 1 KDockContainer?: " << dc << endl;
}
kdDebug(282) << "Child0 : " << child0 << endl;
@@ -348,7 +348,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
//
if( ( (m_orientation==TQt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) ||
( (m_orientation==TQt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) {
- if ((c0->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget()))
+ if ((c0->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c0->getWidget()))
&& (dc->isOverlapMode())) {
// child0 ist a KDockContainer
int position;
@@ -367,7 +367,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
divider->setGeometry(position, 0, 4, height());
}
} else {
- if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))
+ if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))
&& (dc->isOverlapMode())) {
// child1 ist a KDockContainer
int position;
@@ -403,7 +403,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
int diff = 0;
if (m_orientation == TQt::Horizontal) {
- if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
+ if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) {
// bottom is dockcontainer
if( divider->isVisible() ) {
child0->setGeometry(0, 0, width(), position);
@@ -419,7 +419,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
}
divider->setGeometry(0, position, width(), 4);
} else {
- if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
+ if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) {
// right is dockcontainer
if( divider->isVisible() ) {
child0->setGeometry(0, 0, position, height());
diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp
index 142c4b437..33ca5bc19 100644
--- a/tdeui/keditlistbox.cpp
+++ b/tdeui/keditlistbox.cpp
@@ -418,7 +418,7 @@ void KEditListBox::virtual_hook( int, void* )
KEditListBox::CustomEditor::CustomEditor( KComboBox *combo )
{
m_representationWidget = combo;
- m_lineEdit = tqt_dynamic_cast<KLineEdit*>( combo->lineEdit() );
+ m_lineEdit = dynamic_cast<KLineEdit*>( combo->lineEdit() );
assert( m_lineEdit );
}
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp
index 47f6c405f..c9047c2f6 100644
--- a/tdeui/kpixmapio.cpp
+++ b/tdeui/kpixmapio.cpp
@@ -664,7 +664,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
{
uchar *src;
TQ_INT32 val, *dst;
- TQRgb pixel, *clut = img.tqcolorTable();
+ TQRgb pixel, *clut = img.colorTable();
for (y=0; y<height; y++)
{
src = const_cast<TQImage&>(img).scanLine(y);
@@ -721,7 +721,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
{
uchar *src;
TQ_INT32 val, *dst;
- TQRgb pixel, *clut = img.tqcolorTable();
+ TQRgb pixel, *clut = img.colorTable();
for (y=0; y<height; y++)
{
src = const_cast<TQImage&>(img).scanLine(y);
@@ -780,7 +780,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
{
uchar *src, *dst;
int w1 = width/4;
- TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4;
+ TQRgb *clut = img.colorTable(), d1, d2, d3, d4;
for (y=0; y<height; y++)
{
src = const_cast<TQImage&>(img).scanLine(y);
@@ -841,7 +841,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
{
uchar *src, *dst;
int w1 = width/4;
- TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4;
+ TQRgb *clut = img.colorTable(), d1, d2, d3, d4;
for (y=0; y<height; y++)
{
src = const_cast<TQImage&>(img).scanLine(y);
@@ -878,7 +878,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
} else
{
uchar *src;
- TQRgb *dst, *clut = img.tqcolorTable();
+ TQRgb *dst, *clut = img.colorTable();
for (y=0; y<height; y++)
{
src = const_cast<TQImage&>(img).scanLine(y);
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 233907b72..8e9b376b2 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -552,7 +552,7 @@ void KXMLGUIFactory::configureAction( TDEAction *action, const TQDomAttr &attrib
int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSettings )
{
- KKeyDialog dlg( bAllowLetterShortcuts, tqt_dynamic_cast<TQWidget*>(parent()) );
+ KKeyDialog dlg( bAllowLetterShortcuts, dynamic_cast<TQWidget*>(parent()) );
TQPtrListIterator<KXMLGUIClient> it( d->m_clients );
KXMLGUIClient *client;
while( (client=it.current()) !=0 )
diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp
index 34543cf04..cb25ca3fe 100644
--- a/tdeui/qxembed.cpp
+++ b/tdeui/qxembed.cpp
@@ -479,7 +479,7 @@ static int qxembed_x11_event_filter( XEvent* e)
// L0683: Set focus on saved focus widget
if ( focusCurrent ) {
focusCurrent->setFocus();
- if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( focusCurrent ))
+ if( QXEmbed* emb = dynamic_cast< QXEmbed* >( focusCurrent ))
emb->updateEmbeddedFocus( true );
}
else if ( !w->topLevelWidget()->focusWidget() )
@@ -513,7 +513,7 @@ static int qxembed_x11_event_filter( XEvent* e)
// We first record what the focus widget was
// and clear the Qt focus.
if ( w->topLevelWidget()->focusWidget() ) {
- if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget()))
+ if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget()))
emb->updateEmbeddedFocus( false );
focusMap->insert( w->topLevelWidget(),
new TQGuardedPtr<TQWidget>(w->topLevelWidget()->focusWidget() ) );
diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp
index 9e9ec6a54..fe9b0644b 100644
--- a/tdeui/tdeaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -256,7 +256,7 @@ void TDEAction::initPrivate( const TQString& text, const TDEShortcut& cut,
{
d->m_cutDefault = cut;
- m_parentCollection = tqt_dynamic_cast<TDEActionCollection *>( parent() );
+ m_parentCollection = dynamic_cast<TDEActionCollection *>( parent() );
kdDebug(129) << "TDEAction::initPrivate(): this = " << this << " name = \"" << name() << "\" cut = " << cut.toStringInternal() << " m_parentCollection = " << m_parentCollection << endl;
if ( m_parentCollection )
m_parentCollection->insert( this );
@@ -822,7 +822,7 @@ void TDEAction::plugMainWindowAccel( TQWidget *w )
while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
tl = n;
- TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
+ TDEMainWindow * mw = dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
if (mw)
plugAccel( mw->accel() );
else
@@ -1057,12 +1057,12 @@ TQWidget* TDEAction::container( int index ) const
TDEToolBar* TDEAction::toolBar( int index ) const
{
- return tqt_dynamic_cast<TDEToolBar *>( d->m_containers[ index ].m_container );
+ return dynamic_cast<TDEToolBar *>( d->m_containers[ index ].m_container );
}
TQPopupMenu* TDEAction::popupMenu( int index ) const
{
- return tqt_dynamic_cast<TQPopupMenu *>( d->m_containers[ index ].m_container );
+ return dynamic_cast<TQPopupMenu *>( d->m_containers[ index ].m_container );
}
TQWidget* TDEAction::representative( int index ) const
@@ -1126,14 +1126,14 @@ void TDEAction::slotPopupActivated()
{
if( ::tqqt_cast<TQSignal *>(sender()))
{
- int id = tqt_dynamic_cast<const TQSignal *>(sender())->value().toInt();
+ int id = dynamic_cast<const TQSignal *>(sender())->value().toInt();
int pos = findContainer(id);
if(pos != -1)
{
- TQPopupMenu* qpm = tqt_dynamic_cast<TQPopupMenu *>( container(pos) );
+ TQPopupMenu* qpm = dynamic_cast<TQPopupMenu *>( container(pos) );
if(qpm)
{
- TDEPopupMenu* kpm = tqt_dynamic_cast<TDEPopupMenu *>( qpm );
+ TDEPopupMenu* kpm = dynamic_cast<TDEPopupMenu *>( qpm );
TQt::ButtonState state;
if ( kpm ) // TDEPopupMenu? Nice, it stores the state.
state = kpm->state();
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index f70615b6c..5bea6cdaa 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -2028,7 +2028,7 @@ int TDEToggleToolBarAction::plug( TQWidget* w, int index )
while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
tl = n;
- TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
+ TDEMainWindow * mw = dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
if ( mw )
m_toolBar = mw->toolBar( m_toolBarName );
diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp
index fe0f123a9..3e78c01b0 100644
--- a/tdeui/tdeactioncollection.cpp
+++ b/tdeui/tdeactioncollection.cpp
@@ -110,7 +110,7 @@ TDEActionCollection::TDEActionCollection( TQObject *parent, const char *name,
kdWarning(129) << "TDEActionCollection::TDEActionCollection( TQObject *parent, const char *name, TDEInstance *instance )" << endl; //ellis
kdDebug(129) << kdBacktrace() << endl;
d = new TDEActionCollectionPrivate;
- TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent );
+ TQWidget* w = dynamic_cast<TQWidget*>( parent );
if( w )
setWidget( w );
//d->m_bOneTDEAccelOnly = (d->m_tdeaccelList.count() > 0);
diff --git a/tdeui/tdelistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp
index 50ad3d276..2ed43ba4b 100644
--- a/tdeui/tdelistviewsearchline.cpp
+++ b/tdeui/tdelistviewsearchline.cpp
@@ -470,7 +470,7 @@ TDEListViewSearchLine *TDEListViewSearchLineWidget::searchLine() const
void TDEListViewSearchLineWidget::positionInToolBar()
{
- TDEToolBar *toolBar = tqt_dynamic_cast<TDEToolBar *>(parent());
+ TDEToolBar *toolBar = dynamic_cast<TDEToolBar *>(parent());
if(toolBar) {
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 9cfd2948f..039c483d8 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -195,7 +195,7 @@ TQSizePolicy TDEToolBarSeparator::sizePolicy() const
TDEToolBar::TDEToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig )
: TQToolBar( TQString::fromLatin1( name ),
- tqt_dynamic_cast<TQMainWindow*>(parent),
+ dynamic_cast<TQMainWindow*>(parent),
parent, false,
name ? name : "mainToolBar")
{
@@ -432,7 +432,7 @@ KAnimWidget *TDEToolBar::animatedWidget( int id )
Id2WidgetMap::Iterator it = id2widget.find( id );
if ( it == id2widget.end() )
return 0;
- KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(*it);
+ KAnimWidget *aw = dynamic_cast<KAnimWidget *>(*it);
if ( aw )
return aw;
TQObjectList *l = queryList( "KAnimWidget" );
@@ -442,7 +442,7 @@ KAnimWidget *TDEToolBar::animatedWidget( int id )
}
for ( TQObject *o = l->first(); o; o = l->next() ) {
- KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(o);
+ KAnimWidget *aw = dynamic_cast<KAnimWidget *>(o);
if ( aw )
{
delete l;
@@ -615,7 +615,7 @@ KComboBox * TDEToolBar::getCombo(int id)
Id2WidgetMap::Iterator it = id2widget.find( id );
if ( it == id2widget.end() )
return 0;
- return tqt_dynamic_cast<KComboBox *>( *it );
+ return dynamic_cast<KComboBox *>( *it );
}
@@ -624,7 +624,7 @@ KLineEdit * TDEToolBar::getLined (int id)
Id2WidgetMap::Iterator it = id2widget.find( id );
if ( it == id2widget.end() )
return 0;
- return tqt_dynamic_cast<KLineEdit *>( *it );
+ return dynamic_cast<KLineEdit *>( *it );
}
@@ -633,7 +633,7 @@ TDEToolBarButton * TDEToolBar::getButton (int id)
Id2WidgetMap::Iterator it = id2widget.find( id );
if ( it == id2widget.end() )
return 0;
- return tqt_dynamic_cast<TDEToolBarButton *>( *it );
+ return dynamic_cast<TDEToolBarButton *>( *it );
}
@@ -947,7 +947,7 @@ void TDEToolBar::setFlat (bool flag)
else
mainWindow()->moveDockWindow( this, DockTop );
// And remember to save the new look later
- TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+ TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
if ( kmw )
kmw->setSettingsDirty();
}
@@ -1093,7 +1093,7 @@ void TDEToolBar::saveSettings(TDEConfig *config, const TQString &_configGroup)
// reappear at the same position the next time.
// The whole set of indexes has to be saved.
//kdDebug(220) << name() << " writing index " << index << endl;
- TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+ TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
// don't save if there's only one toolbar
// Don't use kmw->toolBarIterator() because you might
@@ -1204,7 +1204,7 @@ void TDEToolBar::mousePressEvent ( TQMouseEvent *m )
else
return; // assume this was an action handled elsewhere, no need for setSettingsDirty()
}
- TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mw);
+ TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mw);
if ( kmw )
kmw->setSettingsDirty();
}
@@ -1238,17 +1238,17 @@ void TDEToolBar::rebuildLayout()
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( w == rightAligned )
continue;
- TDEToolBarSeparator *ktbs = tqt_dynamic_cast<TDEToolBarSeparator *>(w);
+ TDEToolBarSeparator *ktbs = dynamic_cast<TDEToolBarSeparator *>(w);
if ( ktbs && !ktbs->showLine() ) {
l->addSpacing( orientation() == TQt::Vertical ? w->sizeHint().height() : w->sizeHint().width() );
w->hide();
continue;
}
- if ( tqt_dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu?
+ if ( dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu?
continue;
l->addWidget( w );
w->show();
- if ((orientation() == TQt::Horizontal) && tqt_dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ?
+ if ((orientation() == TQt::Horizontal) && dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ?
l->addSpacing(2); // A little bit extra spacing behind it.
}
if ( rightAligned ) {
@@ -1270,14 +1270,14 @@ void TDEToolBar::rebuildLayout()
void TDEToolBar::childEvent( TQChildEvent *e )
{
if ( e->child()->isWidgetType() ) {
- TQWidget * w = tqt_dynamic_cast<TQWidget *>(e->child());
+ TQWidget * w = dynamic_cast<TQWidget *>(e->child());
if (!w || !(::qstrcmp( "qt_dockwidget_internal", w->name())))
{
TQToolBar::childEvent( e );
return;
}
if ( e->type() == TQEvent::ChildInserted ) {
- if ( !tqt_dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu
+ if ( !dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu
// prevent items that have been explicitly inserted by insert*() from
// being inserted again
if ( !widget2id.contains( w ) )
@@ -1367,7 +1367,7 @@ TQSize TDEToolBar::sizeHint() const
minSize = minSize.expandedTo(TQSize(0, sh.height()));
minSize += TQSize(sh.width()+1, 0);
- if (tqt_dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ?
+ if (dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ?
minSize += TQSize(2, 0); // A little bit extra spacing behind it.
}
@@ -1478,7 +1478,7 @@ void TDEToolBar::slotAppearanceChanged()
applyAppearanceSettings(TDEGlobal::config(), TQString::null, true /* lose local settings */ );
// And remember to save the new look later
- TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+ TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
if ( kmw )
kmw->setSettingsDirty();
}
@@ -1750,7 +1750,7 @@ void TDEToolBar::toolBarPosChanged( TQToolBar *tb )
if ( d->oldPos == DockMinimized )
rebuildLayout();
d->oldPos = (TQMainWindow::ToolBarDock)barPos();
- TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+ TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
if ( kmw )
kmw->setSettingsDirty();
}
@@ -2139,7 +2139,7 @@ void TDEToolBar::slotContextAboutToShow()
// and ToolBarHandler::setupActions() deletes it, so better not keep it around.
// So we currently plug/unplug the last two actions of the menu.
// Another way would be to keep around the actions and plug them all into a (new each time) popupmenu.
- TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+ TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
if ( kmw ) {
kmw->setupToolbarMenuActions();
// Only allow hiding a toolbar if the action is also plugged somewhere else (e.g. menubar)
@@ -2219,7 +2219,7 @@ void TDEToolBar::slotContextAboutToHide()
{
// We have to unplug whatever slotContextAboutToShow plugged into the menu.
// Unplug the toolbar menu action
- TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+ TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
if ( kmw && kmw->toolBarMenuAction() )
if ( kmw->toolBarMenuAction()->containerCount() > 1 )
kmw->toolBarMenuAction()->unplug(context);
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index 2c859ab2f..9e3313de3 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -123,7 +123,7 @@ TDEToolBarButton::TDEToolBarButton( const TQString& _icon, int _id,
TQToolButton::setTextLabel(_txt);
d->m_instance = _instance;
- d->m_parent = tqt_dynamic_cast<TDEToolBar*>(_parent);
+ d->m_parent = dynamic_cast<TDEToolBar*>(_parent);
if (d->m_parent) {
connect(d->m_parent, TQT_SIGNAL( modechange() ),
this, TQT_SLOT( modeChange() ));
@@ -156,7 +156,7 @@ TDEToolBarButton::TDEToolBarButton( const TQPixmap& pixmap, int _id,
d->m_id = _id;
TQToolButton::setTextLabel(txt);
- d->m_parent = tqt_dynamic_cast<TDEToolBar*>(_parent);
+ d->m_parent = dynamic_cast<TDEToolBar*>(_parent);
if (d->m_parent) {
connect(d->m_parent, TQT_SIGNAL( modechange() ),
this, TQT_SLOT( modeChange() ));
diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp
index dd9cf7087..45f2564e9 100644
--- a/tdeui/tdetoolbarhandler.cpp
+++ b/tdeui/tdetoolbarhandler.cpp
@@ -51,7 +51,7 @@ namespace
TQPtrListIterator<TQDockWindow> dockWindowIt( dockWindows );
for ( ; dockWindowIt.current(); ++dockWindowIt ) {
- TDEToolBar *toolBar = tqt_dynamic_cast<TDEToolBar *>( dockWindowIt.current() );
+ TDEToolBar *toolBar = dynamic_cast<TDEToolBar *>( dockWindowIt.current() );
if ( !toolBar )
continue;
@@ -232,7 +232,7 @@ void ToolBarHandler::connectToActionContainer( TDEAction *action )
void ToolBarHandler::connectToActionContainer( TQWidget *container )
{
- TQPopupMenu *popupMenu = tqt_dynamic_cast<TQPopupMenu *>( container );
+ TQPopupMenu *popupMenu = dynamic_cast<TQPopupMenu *>( container );
if ( !popupMenu )
return;