summaryrefslogtreecommitdiffstats
path: root/konqueror/konq_viewmgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/konq_viewmgr.cpp')
-rw-r--r--konqueror/konq_viewmgr.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp
index 495d267e8..c7ead1d0b 100644
--- a/konqueror/konq_viewmgr.cpp
+++ b/konqueror/konq_viewmgr.cpp
@@ -55,8 +55,8 @@ KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow )
m_bLoadingProfile = false;
m_activePartChangedTimer = new TQTimer(this);
- connect(m_activePartChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitActivePartChanged()));
- connect( this, TQT_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQT_SLOT( slotActivePartChanged ( KParts::Part * ) ) );
+ connect(m_activePartChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitActivePartChanged()));
+ connect( this, TQ_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQ_SLOT( slotActivePartChanged ( KParts::Part * ) ) );
}
KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQString &serviceName )
@@ -90,7 +90,7 @@ KonqViewManager::~KonqViewManager()
clear();
}
-KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
+KonqView* KonqViewManager::splitView ( TQt::Orientation orientation,
const TQString &serviceType,
const TQString &serviceName,
bool newOneFirst, bool forceAutoEmbed )
@@ -139,7 +139,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
//kdDebug(1202) << "Create new Container" << endl;
KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, parentContainer->widget(), parentContainer );
- connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+ connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
parentContainer->insertChildFrame( newContainer, index );
if ( moveNewContainer ) {
@@ -200,7 +200,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
return newView;
}
-KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
+KonqView* KonqViewManager::splitWindow( TQt::Orientation orientation,
const TQString &serviceType,
const TQString &serviceName,
bool newOneFirst )
@@ -231,7 +231,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
m_pMainWindow->removeChildFrame( mainFrame );
KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, m_pMainWindow, 0L);
- connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+ connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
m_pMainWindow->insertChildFrame( newContainer );
@@ -286,7 +286,7 @@ void KonqViewManager::convertDocContainer()
KonqFrameTabs* newContainer = new KonqFrameTabs( parentContainer->widget() , parentContainer, this);
parentContainer->insertChildFrame( newContainer );
- connect( newContainer, TQT_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQT_SLOT(slotCtrlTabPressed()) );
+ connect( newContainer, TQ_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQ_SLOT(slotCtrlTabPressed()) );
m_pDocContainer->widget()->reparent( newContainer, pos );
newContainer->insertChildFrame( m_pDocContainer );
@@ -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;
@@ -882,7 +882,7 @@ void KonqViewManager::slotPassiveModePartDeleted()
// Passive mode parts aren't registered to the part manager,
// so we have to handle suicidal ones ourselves
KParts::ReadOnlyPart * part = const_cast<KParts::ReadOnlyPart *>( static_cast<const KParts::ReadOnlyPart *>( sender() ) );
- disconnect( part, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) );
+ disconnect( part, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) );
kdDebug(1202) << "KonqViewManager::slotPassiveModePartDeleted part=" << part << endl;
KonqView * view = m_pMainWindow->childView( part );
kdDebug(1202) << "view=" << view << endl;
@@ -1038,8 +1038,8 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
m_pMainWindow, service, partServiceOffers, appServiceOffers, sType, passiveMode );
//kdDebug(1202) << "KonqView created - v=" << v << " v->part()=" << v->part() << endl;
- TQObject::connect( v, TQT_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ),
- m_pMainWindow, TQT_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) );
+ TQObject::connect( v, TQ_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ),
+ m_pMainWindow, TQ_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) );
m_pMainWindow->insertChildView( v );
@@ -1063,7 +1063,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
else
{
// Passive views aren't registered, but we still want to detect the suicidal ones
- connect( v->part(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) );
+ connect( v->part(), TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) );
}
//kdDebug(1202) << "KonqViewManager::setupView done" << endl;
@@ -1574,14 +1574,14 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
//load container config
TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) );
//kdDebug(1202) << "Orientation: " << ostr << endl;
- Qt::Orientation o;
+ TQt::Orientation o;
if( ostr == "Vertical" )
- o = Qt::Vertical;
+ o = TQt::Vertical;
else if( ostr == "Horizontal" )
- o = Qt::Horizontal;
+ o = TQt::Horizontal;
else {
kdWarning() << "Profile Loading Error: No orientation specified in " << name << endl;
- o = Qt::Horizontal;
+ o = TQt::Horizontal;
}
TQValueList<int> sizes =
@@ -1599,7 +1599,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
else
{
KonqFrameContainer *newContainer = new KonqFrameContainer( o, parent->widget(), parent );
- connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+ connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
int tabindex = -1;
if(openAfterCurrentPage && parent->frameType() == "Tabs") // Need to honor it, if possible
@@ -1628,7 +1628,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
//kdDebug(1202) << "KonqViewManager::loadItem: Item is a Tabs" << endl;
KonqFrameTabs *newContainer = new KonqFrameTabs( parent->widget(), parent, this );
- connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+ connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
parent->insertChildFrame( newContainer );
m_pDocContainer = newContainer;
@@ -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();
@@ -1666,10 +1666,10 @@ void KonqViewManager::setProfiles( TDEActionMenu *profiles )
if ( m_pamProfiles )
{
- connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotProfileActivated( int ) ) );
- connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( aboutToShow() ),
- this, TQT_SLOT( slotProfileListAboutToShow() ) );
+ connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotProfileActivated( int ) ) );
+ connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+ this, TQ_SLOT( slotProfileListAboutToShow() ) );
}
//KonqMainWindow::enableAllActions will call it anyway
//profileListDirty();