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, 4 insertions, 4 deletions

diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc
index b1ebdc92f..b025f3d4d 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cc
@@ -48,9 +48,9 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
 
     m_buttonGroup = new TQButtonGroup( i18n("Background"), page );
     m_buttonGroup->setColumnLayout( 0, Qt::Vertical );
-    m_buttonGroup->layout()->setMargin( KDialog::marginHint() );
-    m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() );
-    TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() );
+    m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() );
+    m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+    TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() );
     groupLayout->tqsetAlignment( Qt::AlignTop );
     mainLayout->addWidget( m_buttonGroup );
 
@@ -142,7 +142,7 @@ void KonqBgndDialog::initPictures()
         TQStringList::ConstIterator it;
         for ( it = list.begin(); it != list.end(); it++ )
             m_comboPicture->comboBox()->insertItem(
-                ( (*it).at(0) == '/' ) ?    // if absolute path
+                ( (*it).tqat(0) == '/' ) ?    // if absolute path
                 KURL( *it ).fileName() :  // then only fileName
                 *it );
     }