summaryrefslogtreecommitdiffstats
path: root/khelpcenter
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
commitcc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch)
tree2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 /khelpcenter
parent107dd1f98367d07df7cbe2042786511e44706d3a (diff)
downloadtdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.tar.gz
tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.zip
Allow kdebase to (mostly) function correctly with TQt for Qt4
Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch) Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6) git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khelpcenter')
-rw-r--r--khelpcenter/docentry.cpp2
-rw-r--r--khelpcenter/history.cpp22
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp4
-rw-r--r--khelpcenter/htmlsearch/ktagcombobox.cpp4
-rw-r--r--khelpcenter/toc.cpp2
-rw-r--r--khelpcenter/view.cpp4
6 files changed, 19 insertions, 19 deletions
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index 96747696b..03f9a7721 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -278,7 +278,7 @@ void DocEntry::addChild( DocEntry *entry )
entry->weight() < mChildren[ i + 1 ]->weight() ) {
entry->setNextSibling( mChildren[ i + 1 ] );
mChildren[ i ]->setNextSibling( entry );
- mChildren.insert( mChildren.at( i + 1 ), entry );
+ mChildren.insert( mChildren.tqat( i + 1 ), entry );
break;
}
}
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index ef9cbe7c0..6f37884f4 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -93,7 +93,7 @@ void History::createEntry()
Entry * current = m_entries.current();
if (current)
{
- m_entries.at( m_entries.count() - 1 ); // go to last one
+ m_entries.tqat( m_entries.count() - 1 ); // go to last one
for ( ; m_entries.current() != current ; )
{
if ( !m_entries.removeLast() ) { // and remove from the end (faster and easier)
@@ -101,7 +101,7 @@ void History::createEntry()
return;
}
else
- m_entries.at( m_entries.count() - 1 );
+ m_entries.tqat( m_entries.count() - 1 );
}
// Now current is the current again.
@@ -111,7 +111,7 @@ void History::createEntry()
// Append a new entry
m_entries.append( new Entry ); // made current
- Q_ASSERT( m_entries.at() == (int) m_entries.count() - 1 );
+ Q_ASSERT( m_entries.tqat() == (int) m_entries.count() - 1 );
}
void History::updateCurrentEntry( View *view )
@@ -199,9 +199,9 @@ void History::goHistory( int steps )
Entry *current = m_entries.current();
if ( current && !current->view ) m_entries.remove();
- int newPos = m_entries.at() + steps;
+ int newPos = m_entries.tqat() + steps;
- current = m_entries.at( newPos );
+ current = m_entries.tqat( newPos );
if ( !current ) {
kdError() << "No History entry at position " << newPos << endl;
return;
@@ -276,14 +276,14 @@ void History::fillGoMenu()
// Second case: big history, in one or both directions
{
// Assume both directions first (in this case we place the current URL in the middle)
- m_goMenuHistoryStartPos = m_entries.at() + 4;
+ m_goMenuHistoryStartPos = m_entries.tqat() + 4;
// Forward not big enough ?
- if ( m_entries.at() > (int)m_entries.count() - 4 )
+ if ( m_entries.tqat() > (int)m_entries.count() - 4 )
m_goMenuHistoryStartPos = m_entries.count() - 1;
}
Q_ASSERT( m_goMenuHistoryStartPos >= 0 && (uint)m_goMenuHistoryStartPos < m_entries.count() );
- m_goMenuHistoryCurrentPos = m_entries.at(); // for slotActivated
+ m_goMenuHistoryCurrentPos = m_entries.tqat(); // for slotActivated
fillHistoryPopup( goMenu, false, false, true, m_goMenuHistoryStartPos );
}
@@ -314,7 +314,7 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw
TQPtrListIterator<Entry> it( m_entries );
if (onlyBack || onlyForward)
{
- it += m_entries.at(); // Jump to current item
+ it += m_entries.tqat(); // Jump to current item
if ( !onlyForward ) --it; else ++it; // And move off it
} else if ( startPos )
it += startPos; // Jump to specified start pos
@@ -339,12 +339,12 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw
bool History::canGoBack() const
{
- return m_entries.at() > 0;
+ return m_entries.tqat() > 0;
}
bool History::canGoForward() const
{
- return m_entries.at() != static_cast<int>( m_entries.count() ) - 1;
+ return m_entries.tqat() != static_cast<int>( m_entries.count() ) - 1;
}
#include "history.moc"
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index c9feaa61f..7a3483caf 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -28,7 +28,7 @@ TQString HTMLSearch::dataPath(const TQString& _lang)
void HTMLSearch::scanDir(const TQString& dir)
{
- assert( dir.at( dir.length() - 1 ) == '/' );
+ assert( dir.tqat( dir.length() - 1 ) == '/' );
TQStringList::ConstIterator it;
@@ -83,7 +83,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
TQStringList add = config->readListEntry("Paths");
TQStringList::Iterator it;
for (it = add.begin(); it != add.end(); ++it) {
- if ( ( *it ).at( ( *it ).length() - 1 ) != '/' )
+ if ( ( *it ).tqat( ( *it ).length() - 1 ) != '/' )
( *it ) += '/';
dirs.append(*it);
}
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index 3cb642b5f..9745d6066 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.cpp
+++ b/khelpcenter/htmlsearch/ktagcombobox.cpp
@@ -211,7 +211,7 @@ bool KTagComboBox::containsTag( const TQString &str ) const
TQString KTagComboBox::currentTag() const
{
- return *tags->at(currentItem());
+ return *tags->tqat(currentItem());
}
TQString KTagComboBox::tag(int i) const
@@ -221,7 +221,7 @@ TQString KTagComboBox::tag(int i) const
kdDebug() << "KTagComboBox::tag(), unknown tag " << i << endl;
return TQString::null;
}
- return *tags->at(i);
+ return *tags->tqat(i);
}
int KTagComboBox::currentItem() const
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index 02e59936a..c4eb13f3a 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -164,7 +164,7 @@ void TOC::meinprocExited( KProcess *meinproc )
TQDomComment timestamp = doc.createComment( TQString::number( sourceFileCTime() ) );
doc.documentElement().appendChild( timestamp );
- f.at( 0 );
+ f.tqat( 0 );
TQTextStream stream( &f );
stream.setEncoding( TQTextStream::UnicodeUTF8 );
stream << doc.toString();
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index a28b5097f..8d198f9be 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -62,7 +62,7 @@ View::~View()
void View::copySelectedText()
{
- kapp->clipboard()->setText( selectedText() );
+ kapp->tqclipboard()->setText( selectedText() );
}
bool View::openURL( const KURL &url )
@@ -276,7 +276,7 @@ void View::showMenu( const TQString& url, const TQPoint& pos)
void View::slotCopyLink()
{
- TQApplication::clipboard()->setText(mCopyURL);
+ TQApplication::tqclipboard()->setText(mCopyURL);
}
bool View::prevPage(bool checkOnly)