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

1 files changed, 6 insertions, 6 deletions

diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc
index f14e462a2..aaa0c77b2 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cc
@@ -46,10 +46,10 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
   TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
-  group->layout()->setMargin( marginHint() );
-  group->layout()->setSpacing( spacingHint() );
+  group->tqlayout()->setMargin( marginHint() );
+  group->tqlayout()->setSpacing( spacingHint() );
 
-  TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 );
+  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 );
   groupLayout->tqsetAlignment( Qt::AlignTop );
 
   mSheetTitle = new KLineEdit( group );
@@ -58,10 +58,10 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
   topLayout->addWidget( group );
 
   group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page );
-  group->layout()->setMargin( marginHint() );
-  group->layout()->setSpacing( spacingHint() );
+  group->tqlayout()->setMargin( marginHint() );
+  group->tqlayout()->setSpacing( spacingHint() );
 
-  groupLayout = new TQGridLayout( group->layout(), 3, 2 );
+  groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 );
   groupLayout->tqsetAlignment( Qt::AlignTop );
 
   TQLabel *label = new TQLabel( i18n( "Rows:" ), group );