summaryrefslogtreecommitdiffstats
path: root/khelpcenter/htmlsearch
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/htmlsearch
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/htmlsearch')
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp4
-rw-r--r--khelpcenter/htmlsearch/ktagcombobox.cpp4
2 files changed, 4 insertions, 4 deletions
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