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

2 files changed, 2 insertions, 2 deletions

diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index a2c7ceb53..4927eda48 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -38,7 +38,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title,
   setColumnLayout(0, Qt::Vertical);
   layout()->setSpacing(0);
   layout()->setMargin(0);
-  TQGridLayout* thisLayout = new TQGridLayout(layout());
+  TQGridLayout* thisLayout = new TQGridLayout(tqlayout());
   thisLayout->tqsetAlignment(Qt::AlignTop);
   thisLayout->setSpacing(KDialog::spacingHint());
   thisLayout->setMargin(KDialog::marginHint());
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index eeedca18a..88baa1103 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -135,7 +135,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   setColumnLayout(0, Qt::Vertical);
   layout()->setSpacing(0);
   layout()->setMargin(0);
-  TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
+  TQGridLayout *this_layout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2);
   this_layout->tqsetAlignment(Qt::AlignTop);
   this_layout->setSpacing(3);
   this_layout->setMargin(11);