summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/ui
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 /kicker/kicker/ui
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 'kicker/kicker/ui')
-rw-r--r--kicker/kicker/ui/k_mnu.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp2
-rw-r--r--kicker/kicker/ui/removeapplet_mnu.cpp4
-rw-r--r--kicker/kicker/ui/removebutton_mnu.cpp4
-rw-r--r--kicker/kicker/ui/removeextension_mnu.cpp4
-rw-r--r--kicker/kicker/ui/service_mnu.cpp4
6 files changed, 10 insertions, 10 deletions
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index d2952d93a..06fc689f6 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -344,7 +344,7 @@ void PanelKMenu::initialize()
if (clients.count() > 0) {
TQIntDictIterator<KickerClientMenu> it(clients);
while (it){
- if (it.current()->text.at(0) != '.')
+ if (it.current()->text.tqat(0) != '.')
insertItem(
it.current()->icon,
it.current()->text,
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 3fa259189..66dd71503 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -1131,7 +1131,7 @@ void KMenu::fillMenu(KServiceGroup::Ptr&
}
// Ignore dotfiles.
- if ((g->name().at(0) == '.'))
+ if ((g->name().tqat(0) == '.'))
{
continue;
}
diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp
index 3c14a74aa..295651523 100644
--- a/kicker/kicker/ui/removeapplet_mnu.cpp
+++ b/kicker/kicker/ui/removeapplet_mnu.cpp
@@ -87,9 +87,9 @@ void PanelRemoveAppletMenu::slotAboutToShow()
void PanelRemoveAppletMenu::slotExec(int id)
{
- if (m_containers.at(id) != m_containers.end())
+ if (m_containers.tqat(id) != m_containers.end())
{
- m_containerArea->removeContainer(*m_containers.at(id));
+ m_containerArea->removeContainer(*m_containers.tqat(id));
}
}
diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp
index 8f02abd67..678d6a78f 100644
--- a/kicker/kicker/ui/removebutton_mnu.cpp
+++ b/kicker/kicker/ui/removebutton_mnu.cpp
@@ -95,9 +95,9 @@ void PanelRemoveButtonMenu::slotAboutToShow()
void PanelRemoveButtonMenu::slotExec( int id )
{
- if (containers.at(id) != containers.end())
+ if (containers.tqat(id) != containers.end())
{
- containerArea->removeContainer(*containers.at(id));
+ containerArea->removeContainer(*containers.tqat(id));
}
}
diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp
index e1d8d62c4..c28ae1162 100644
--- a/kicker/kicker/ui/removeextension_mnu.cpp
+++ b/kicker/kicker/ui/removeextension_mnu.cpp
@@ -100,9 +100,9 @@ void PanelRemoveExtensionMenu::slotExec( int id )
{
ExtensionManager::the()->removeAllContainers();
}
- else if (m_containers.at(id) != m_containers.end())
+ else if (m_containers.tqat(id) != m_containers.end())
{
- ExtensionManager::the()->removeContainer(*m_containers.at(id));
+ ExtensionManager::the()->removeContainer(*m_containers.tqat(id));
}
}
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 76aa6162e..9c4d09929 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -281,7 +281,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
}
// Ignore dotfiles.
- if ((g->name().at(0) == '.'))
+ if ((g->name().tqat(0) == '.'))
{
continue;
}
@@ -445,7 +445,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
return;
// ignore dotfiles.
- if ((serviceName.at(0) == '.'))
+ if ((serviceName.tqat(0) == '.'))
return;
// item names may contain ampersands. To avoid them being converted