From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 16 Feb 2011 20:17:18 +0000
Subject: Moved kpilot from kdepim to applications, as the core Trinity
 libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kontact/plugins/newsticker/kcmkontactknt.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kontact/plugins/newsticker/kcmkontactknt.cpp')

diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 13734a8ab..0b0a98a33 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -60,22 +60,22 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi
                  Ok, parent, 0, true, true )
 {
   TQWidget *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(),
                                          spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Name:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mTitle = new TQLineEdit( page );
   label->setBuddy( mTitle );
-  layout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
 
   label = new TQLabel( i18n( "URL:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mURL = new TQLineEdit( page );
   label->setBuddy( mURL );
-  layout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
 
   mTitle->setText( title );
   mURL->setText( url );
@@ -331,16 +331,16 @@ void KCMKontactKNT::modified()
 
 void KCMKontactKNT::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mAllNews = new KListView( this );
   mAllNews->addColumn( i18n( "All" ) );
   mAllNews->setRootIsDecorated( true );
   mAllNews->setFullWidth( true );
-  layout->addWidget( mAllNews, 0, 0 );
+  tqlayout->addWidget( mAllNews, 0, 0 );
 
-  TQVBoxLayout *vbox = new TQVBoxLayout( layout, KDialog::spacingHint() );
+  TQVBoxLayout *vbox = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
 
   vbox->addStretch();
   mAddButton = new KPushButton( i18n( "Add" ), this );
@@ -354,12 +354,12 @@ void KCMKontactKNT::initGUI()
   mSelectedNews = new KListView( this );
   mSelectedNews->addColumn( i18n( "Selected" ) );
   mSelectedNews->setFullWidth( true );
-  layout->addWidget( mSelectedNews, 0, 2 );
+  tqlayout->addWidget( mSelectedNews, 0, 2 );
 
   TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
                                   i18n( "News Feed Settings" ), this );
 
-  TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3,
+  TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3,
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Refresh time:" ), box );
@@ -384,7 +384,7 @@ void KCMKontactKNT::initGUI()
   mDeleteButton->setEnabled( false );
   boxLayout->addWidget( mDeleteButton, 1, 2 );
 
-  layout->addMultiCellWidget( box, 1, 1, 0, 2 );
+  tqlayout->addMultiCellWidget( box, 1, 1, 0, 2 );
 }
 
 bool KCMKontactKNT::dcopActive() const
-- 
cgit v1.2.1