summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-18 16:43:52 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-20 13:18:04 +0900
commit4a6f4a17320917d60610036649b6192289c3f4a5 (patch)
tree27f568667018288fd8ba55ba98f8266867104db2
parent06606d2ade0b66ab64cee3da0ac9792f55359121 (diff)
downloadtdebase-4a6f4a17320917d60610036649b6192289c3f4a5.tar.gz
tdebase-4a6f4a17320917d60610036649b6192289c3f4a5.zip
Replace various strings '#define'd in tqtinterface
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 8f924d271a4771b8046697fefd778d895a54d93d)
-rw-r--r--kate/app/kateexternaltools.cpp8
-rw-r--r--kate/app/katemdi.cpp2
-rw-r--r--konqueror/about/konq_aboutpage.cpp2
-rw-r--r--konqueror/iconview/konq_iconview.cpp2
-rw-r--r--konqueror/konq_run.cpp4
-rw-r--r--konqueror/konq_tabs.cpp22
-rw-r--r--konqueror/konq_viewmgr.cpp16
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp2
-rw-r--r--konqueror/shellcmdplugin/kshellcmdplugin.cpp2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp2
-rw-r--r--libkonq/konq_operations.cpp6
11 files changed, 34 insertions, 34 deletions
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index fcd0cf807..dcfc6494e 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -185,12 +185,12 @@ void KateExternalToolsCommand::reload () {
}
bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQString &) {
- TQWidget *wv=tqt_dynamic_cast<TQWidget*>(view);
+ TQWidget *wv=dynamic_cast<TQWidget*>(view);
if (!wv) {
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
return false;
}
- KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
+ KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
if (!dmw) {
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
return false;
@@ -200,7 +200,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
if (actionName.isEmpty()) return false;
// kdDebug(13001)<<"actionName is not empty:"<<actionName<<endl;
KateExternalToolsMenuAction *a=
- tqt_dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
+ dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
if (!a) return false;
// kdDebug(13001)<<"trying to find action"<<endl;
TDEAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8()));
@@ -389,7 +389,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
TDEActionPtrList actions = m_actionCollection->actions();
for (TDEActionPtrList::iterator it = actions.begin(); it != actions.end(); ++it )
{
- KateExternalToolAction *action = tqt_dynamic_cast<KateExternalToolAction*>(*it);
+ KateExternalToolAction *action = dynamic_cast<KateExternalToolAction*>(*it);
if ( action )
{
l = action->tool->mimetypes;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 0f4ae25b1..8d5532948 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -449,7 +449,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
if (ev->type()==TQEvent::ContextMenu)
{
TQContextMenuEvent *e = (TQContextMenuEvent *) ev;
- KMultiTabBarTab *bt = tqt_dynamic_cast<KMultiTabBarTab*>(obj);
+ KMultiTabBarTab *bt = dynamic_cast<KMultiTabBarTab*>(obj);
if (bt)
{
kdDebug()<<"Request for popup"<<endl;
diff --git a/konqueror/about/konq_aboutpage.cpp b/konqueror/about/konq_aboutpage.cpp
index cb2149f90..a18aa3eda 100644
--- a/konqueror/about/konq_aboutpage.cpp
+++ b/konqueror/about/konq_aboutpage.cpp
@@ -54,7 +54,7 @@ KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, co
TQObject *parent, const char *name,
const char *, const TQStringList & )
{
- //KonqFrame *frame = tqt_dynamic_cast<KonqFrame *>( parentWidget );
+ //KonqFrame *frame = dynamic_cast<KonqFrame *>( parentWidget );
//if ( !frame ) return 0;
return new KonqAboutPage( //frame->childView()->mainWindow(),
diff --git a/konqueror/iconview/konq_iconview.cpp b/konqueror/iconview/konq_iconview.cpp
index 47e3322b8..1a84fb28d 100644
--- a/konqueror/iconview/konq_iconview.cpp
+++ b/konqueror/iconview/konq_iconview.cpp
@@ -278,7 +278,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
//enable menu item representing the saved sorting criterion
TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion();
- TDERadioAction *sort_action = tqt_dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1()));
+ TDERadioAction *sort_action = dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1()));
if(sort_action!=NULL) sort_action->activate();
m_paSortDirsFirst = new TDEToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" );
diff --git a/konqueror/konq_run.cpp b/konqueror/konq_run.cpp
index 8c2a91329..ecd03d3c4 100644
--- a/konqueror/konq_run.cpp
+++ b/konqueror/konq_run.cpp
@@ -148,7 +148,7 @@ void KonqRun::init()
KParts::BrowserRun::init();
// Maybe init went to the "let's try stat'ing" part. Then connect to info messages.
// (in case it goes to scanFile, this will be done below)
- TDEIO::StatJob *job = tqt_dynamic_cast<TDEIO::StatJob*>( m_job );
+ TDEIO::StatJob *job = dynamic_cast<TDEIO::StatJob*>( m_job );
if ( job && !job->error() && m_pView ) {
connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
@@ -160,7 +160,7 @@ void KonqRun::scanFile()
KParts::BrowserRun::scanFile();
// could be a static cast as of now, but who would notify when
// BrowserRun changes
- TDEIO::TransferJob *job = tqt_dynamic_cast<TDEIO::TransferJob*>( m_job );
+ TDEIO::TransferJob *job = dynamic_cast<TDEIO::TransferJob*>( m_job );
if ( job && !job->error() ) {
connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL& )),
TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) ));
diff --git a/konqueror/konq_tabs.cpp b/konqueror/konq_tabs.cpp
index 868b8edc9..b22610cc2 100644
--- a/konqueror/konq_tabs.cpp
+++ b/konqueror/konq_tabs.cpp
@@ -339,7 +339,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame )
void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage )
{
setTabColor( newPage, TDEGlobalSettings::textColor() );
- KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>(newPage);
+ KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>(newPage);
if (currentFrame && !m_pViewManager->isLoadingProfile()) {
m_pActiveChild = currentFrame;
@@ -367,7 +367,7 @@ void KonqFrameTabs::slotMovedTab( int from, int to )
m_pChildFrameList->remove( fromFrame );
m_pChildFrameList->insert( to, fromFrame );
- KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>( currentPage() );
+ KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>( currentPage() );
if ( currentFrame && !m_pViewManager->isLoadingProfile() ) {
m_pActiveChild = currentFrame;
currentFrame->activateChild();
@@ -451,11 +451,11 @@ void KonqFrameTabs::slotContextMenu( TQWidget *w, const TQPoint &p )
m_pPopupMenu->setItemEnabled( OTHERTABS_ID, tabCount>1 );
m_pSubPopupMenuTab->setItemEnabled( m_closeOtherTabsId, true );
- // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a
+ // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a
// class hierarchy and it could crash one day, but I haven't checked
// setWorkingTab so I don't know if it can handle nulls.
- m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) );
+ m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) );
m_pPopupMenu->exec( p );
}
@@ -495,8 +495,8 @@ void KonqFrameTabs::refreshSubPopupMenuTab()
void KonqFrameTabs::slotCloseRequest( TQWidget *w )
{
if ( m_pChildFrameList->count() > 1 ) {
- // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
- m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) );
+ // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
+ m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) );
emit ( removeTabPopup() );
}
}
@@ -523,8 +523,8 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
{
if ( m_MouseMiddleClickClosesTab ) {
if ( m_pChildFrameList->count() > 1 ) {
- // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
- m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) );
+ // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
+ m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) );
emit ( removeTabPopup() );
}
}
@@ -532,7 +532,7 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection );
KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
if ( !filteredURL.isEmpty() ) {
- KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w);
+ KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
if (frame) {
m_pViewManager->mainWindow()->openURL( frame->activeChildView(), filteredURL );
}
@@ -562,7 +562,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e )
{
KURL::List lstDragURLs;
bool ok = KURLDrag::decode( e, lstDragURLs );
- KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w);
+ KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
if ( ok && lstDragURLs.first().isValid() && frame ) {
KURL lstDragURL = lstDragURLs.first();
if ( lstDragURL != frame->activeChildView()->url() )
@@ -572,7 +572,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e )
void KonqFrameTabs::slotInitiateDrag( TQWidget *w )
{
- KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>( w );
+ KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>( w );
if (frame) {
KURL::List lst;
lst.append( frame->activeChildView()->url() );
diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp
index 2bcd3e52c..5c5bdc29b 100644
--- a/konqueror/konq_viewmgr.cpp
+++ b/konqueror/konq_viewmgr.cpp
@@ -408,7 +408,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
KonqFrameBase* currentFrame;
if ( tab == 0L )
- currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+ currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
else
currentFrame = tab;
@@ -449,7 +449,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
else
tabContainer->setCurrentPage( tabContainer->count() - 1 );
- KonqFrameBase* duplicatedFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+ KonqFrameBase* duplicatedFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
if (duplicatedFrame)
duplicatedFrame->copyHistory( currentFrame );
@@ -478,7 +478,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
KonqFrameBase* currentFrame;
if ( tab == 0L )
- currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+ currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
else
currentFrame = tab;
@@ -506,7 +506,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
if( newDocContainer && newDocContainer->frameType() == "Tabs")
{
KonqFrameTabs *kft = static_cast<KonqFrameTabs *>(newDocContainer);
- KonqFrameBase *newFrame = tqt_dynamic_cast<KonqFrameBase*>(kft->currentPage());
+ KonqFrameBase *newFrame = dynamic_cast<KonqFrameBase*>(kft->currentPage());
if(newFrame)
newFrame->copyHistory( currentFrame );
}
@@ -551,7 +551,7 @@ void KonqViewManager::removeTab( KonqFrameBase* tab )
if ( tab != 0L ) {
currentFrame = tab;
} else {
- currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+ currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
if (!currentFrame) {
return;
}
@@ -620,7 +620,7 @@ void KonqViewManager::removeOtherTabs( KonqFrameBase* tab )
KonqFrameBase *currentFrame;
if ( tab == 0L )
- currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+ currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
else
currentFrame = tab;
@@ -1641,7 +1641,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
loadItem( cfg, newContainer, *it, defaultURL, openURL );
TQWidget* currentPage = newContainer->currentPage();
if (currentPage != 0L) {
- KonqView* activeChildView = tqt_dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView();
+ KonqView* activeChildView = dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView();
if (activeChildView != 0L) {
activeChildView->setCaption( activeChildView->caption() );
activeChildView->setTabIcon( activeChildView->url() );
@@ -1649,7 +1649,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
}
}
- newContainer->setActiveChild( tqt_dynamic_cast<KonqFrameBase*>(newContainer->page(index)) );
+ newContainer->setActiveChild( dynamic_cast<KonqFrameBase*>(newContainer->page(index)) );
newContainer->setCurrentPage( index );
newContainer->show();
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 8889861b3..913444098 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -55,7 +55,7 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent,
m_menu->setEnabled(false);
m_menu->setDelayed(false);
- m_part = tqt_dynamic_cast<KonqDirPart*>(parent);
+ m_part = dynamic_cast<KonqDirPart*>(parent);
if (m_part)
// if parent is not a KonqDirPart, our menu will never show
TQObject::connect(m_part, TQT_SIGNAL(aboutToOpenURL()),
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index 99e04fce8..407d6f297 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -39,7 +39,7 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
void KShellCmdPlugin::slotExecuteShellCommand()
{
- KonqDirPart * part = tqt_dynamic_cast<KonqDirPart *>(parent());
+ KonqDirPart * part = dynamic_cast<KonqDirPart *>(parent());
if ( !part )
{
KMessageBox::sorry(0L, "KShellCmdPlugin::slotExecuteShellCommand: Program error, please report a bug.");
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index a17d594f2..2e741b2f9 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -855,7 +855,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton)
{
- KMultiTabBarTab *bt=tqt_dynamic_cast<KMultiTabBarTab*>(obj);
+ KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
if (bt)
{
kdDebug()<<"Request for popup"<<endl;
diff --git a/libkonq/konq_operations.cpp b/libkonq/konq_operations.cpp
index 8f500db52..0761fe246 100644
--- a/libkonq/konq_operations.cpp
+++ b/libkonq/konq_operations.cpp
@@ -543,7 +543,7 @@ void KonqOperations::doFileCopy()
linkOnly )
{
// Neither control nor shift are pressed => show popup menu
- KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent());
+ KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
bool bSetWallpaper = false;
if ( iconView && iconView->maySetWallpaper() && lst.count() == 1 )
{
@@ -660,8 +660,8 @@ void KonqOperations::setOperation( TDEIO::Job * job, int method, const KURL::Lis
{
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
TQT_SLOT( slotResult( TDEIO::Job * ) ) );
- TDEIO::CopyJob *copyJob = tqt_dynamic_cast<TDEIO::CopyJob*>(job);
- KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent());
+ TDEIO::CopyJob *copyJob = dynamic_cast<TDEIO::CopyJob*>(job);
+ KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
if (copyJob && iconView)
{
connect(copyJob, TQT_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)),