summaryrefslogtreecommitdiffstats
path: root/konqueror/konq_tabs.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /konqueror/konq_tabs.cc
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konqueror/konq_tabs.cc')
-rw-r--r--konqueror/konq_tabs.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index 3cc5cc60d..09d1a0b53 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -196,16 +196,16 @@ void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool sa
TQString newPrefix;
for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next())
{
- newPrefix = TQString::fromLatin1( it->frameType() ) + "T" + TQString::number(i);
+ newPrefix = TQString::tqfromLatin1( it->frameType() ) + "T" + TQString::number(i);
strlst.append( newPrefix );
newPrefix.append( '_' );
it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i );
i++;
}
- config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst );
+ config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst );
- config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ),
+ config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ),
currentPageIndex() );
}
@@ -225,7 +225,7 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other )
void KonqFrameTabs::printFrameInfo( const TQString& spaces )
{
kdDebug(1202) << spaces << "KonqFrameTabs " << this << " visible="
- << TQString("%1").arg(isVisible()) << " activeChild="
+ << TQString("%1").tqarg(isVisible()) << " activeChild="
<< m_pActiveChild << endl;
if (!m_pActiveChild)
@@ -440,7 +440,7 @@ void KonqFrameTabs::slotSubPopupMenuTabActivated( int _id)
void KonqFrameTabs::slotMouseMiddleClick()
{
- TQApplication::clipboard()->setSelectionMode( QClipboard::Selection );
+ TQApplication::tqclipboard()->setSelectionMode( QClipboard::Selection );
KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
if ( !filteredURL.isEmpty() ) {
KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false);
@@ -461,7 +461,7 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
}
}
else {
- TQApplication::clipboard()->setSelectionMode( QClipboard::Selection );
+ TQApplication::tqclipboard()->setSelectionMode( QClipboard::Selection );
KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
if ( !filteredURL.isEmpty() ) {
KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);